From 750c6e60596017afdfc17bdcbaec28c59b5a23a2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 3 Nov 2018 21:21:36 +0000 Subject: [PATCH] Update prod openshift to v3.11 --- inventory/group_vars/os | 2 +- inventory/group_vars/os-stg | 2 +- playbooks/groups/os-cluster.yml | 6 +++--- .../templates/cluster-inventory-prod.j2 | 14 +++++++------- roles/hosts/files/os-hosts | 1 + 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/inventory/group_vars/os b/inventory/group_vars/os index 45680bed19..325ae29082 100644 --- a/inventory/group_vars/os +++ b/inventory/group_vars/os @@ -3,4 +3,4 @@ host_group: os baseiptables: False no_http2: True nm_controlled_resolv: True -#openshift_ansible_upgrading: True +openshift_ansible_upgrading: True diff --git a/inventory/group_vars/os-stg b/inventory/group_vars/os-stg index 3af23220c9..51f9eb910c 100644 --- a/inventory/group_vars/os-stg +++ b/inventory/group_vars/os-stg @@ -4,4 +4,4 @@ baseiptables: False no_http2: False nm_controlled_resolv: True # Only set this when upgrading -openshift_ansible_upgrading: True +openshift_ansible_upgrading: False diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 6b446766df..2efe5b5474 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -161,13 +161,13 @@ - { role: ansible-ansible-openshift-ansible, cluster_inventory_filename: "cluster-inventory", - openshift_release: "v3.10", + openshift_release: "v3.11", 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.10.51-1", + openshift_ansible_version: "openshift-ansible-3.11.38-1", openshift_ansible_ssh_user: root, - openshift_ansible_install_examples: false, + openshift_ansible_install_examples: true, openshift_ansible_containerized_deploy: false, openshift_cluster_masters_group: "os-masters", openshift_cluster_nodes_group: "os-nodes", diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2 index 9646e01d84..5afeddd8f9 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2 @@ -94,13 +94,13 @@ debug_level={{openshift_debug_level}} # WARNING: This value will be used for all hosts in containerized 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_image_tag=v3.10.0 -openshift_image_tag="v3.10" +openshift_image_tag="v3.11" # Specify an exact rpm version to install or configure. # 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.10.14" +openshift_pkg_version="-3.11.16" # If using Atomic Host, you may specify system container image registry for the nodes: #system_images_registry="docker.io" @@ -211,12 +211,12 @@ openshift_use_crio_only={{ openshift_ansible_crio_only }} #openshift_docker_additional_registries=registry.example.com # If oreg_url points to a registry requiring authentication, provide the following: -#oreg_auth_user=some_user -#oreg_auth_password='my-pass' +oreg_auth_user="{{ os_prod_registry_user }}" +oreg_auth_password="{{ os_prod_registry_password }}" # NOTE: oreg_url must be defined by the user for oreg_auth_* to have any affect. # oreg_auth_pass should be generated from running docker login. # To update registry auth credentials, uncomment the following: -#oreg_auth_credentials_replace: True +oreg_auth_credentials_replace=True # OpenShift repository configuration #openshift_additional_repos=[{'id': 'openshift-origin-copr', 'name': 'OpenShift Origin COPR', 'baseurl': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/', 'enabled': 1, 'gpgcheck': 1, 'gpgkey': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/pubkey.gpg'}] @@ -968,10 +968,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.10" +openshift_service_catalog_image="registry.access.redhat.com/openshift3/ose-service-catalog:v3.11.16" # TSB image tag -template_service_broker_version='v3.10' +template_service_broker_version='v3.11.16' # Configure one of more namespaces whose templates will be served by the TSB openshift_template_service_broker_namespaces=['openshift'] diff --git a/roles/hosts/files/os-hosts b/roles/hosts/files/os-hosts index 944b7908e7..afcdf7d14d 100644 --- a/roles/hosts/files/os-hosts +++ b/roles/hosts/files/os-hosts @@ -1,3 +1,4 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 209.132.182.63 registry.access.redhat.com +184.24.173.73 registry.redhat.io