diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index d1bd518f6b..37e8a1ba08 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -136,7 +136,7 @@ openshift_ansible_path: "/root/openshift-ansible", openshift_ansible_pre_playbook: "playbooks/prerequisites.yml", openshift_ansible_playbook: "playbooks/deploy_cluster.yml", - openshift_ansible_version: "openshift-ansible-3.11.145-1", + openshift_ansible_version: "openshift-ansible-3.11.216-1", openshift_ansible_ssh_user: root, openshift_ansible_install_examples: true, openshift_ansible_containerized_deploy: false, diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 index d5072c4a2f..35e63867fa 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 @@ -108,7 +108,7 @@ openshift_image_tag="v3.11" # WARNING: This value will be used for all hosts in RPM based environments, even those that have another version installed. # This could potentially trigger an upgrade and downtime, so be careful with modifying this value after the cluster is set up. #openshift_pkg_version=-3.10.0 -openshift_pkg_version="-3.11.200" +openshift_pkg_version="-3.11.216" # If using Atomic Host, you may specify system container image registry for the nodes: #system_images_registry="docker.io" @@ -719,9 +719,12 @@ openshift_logging_es_nodeselector={"node-role.kubernetes.io/infra":"true"} openshift_logging_storage_kind=nfs openshift_logging_storage_access_modes=['ReadWriteOnce'] openshift_logging_storage_host=ntap-iad2-c02-fedora01-nfs01a -openshift_logging_storage_nfs_directory=/ -openshift_logging_storage_volume_name=openshift-stg-logging +openshift_logging_storage_nfs_directory=/openshift-stg-logging +openshift_logging_storage_volume_name=logging openshift_logging_storage_volume_size=100Gi +openshift_logging_storage_nfs_options='*(rw,root_squash)' +openshift_logging_storage_labels={'storage': 'logging'} +openshift_logging_elasticsearch_storage_type=pvc openshift_logging_es_pvc_size=10Gi openshift_logging_es_pvc_storage_class_name='' openshift_logging_es_pvc_dynamic=true @@ -972,10 +975,10 @@ template_service_broker_install=true # Specify an openshift_service_catalog image # (defaults for origin and openshift-enterprise, repsectively) #openshift_service_catalog_image="docker.io/openshift/origin-service-catalog:{ openshift_image_tag }"" -openshift_service_catalog_image="registry.access.redhat.com/openshift3/ose-service-catalog:v3.11.200" +openshift_service_catalog_image="registry.access.redhat.com/openshift3/ose-service-catalog:v3.11.216" # TSB image tag -template_service_broker_version='v3.11.200' +template_service_broker_version='v3.11.216' # Configure one of more namespaces whose templates will be served by the TSB openshift_template_service_broker_namespaces=['openshift']