Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Update prod openshift to v3.11

Browse source
This commit is contained in:
Kevin Fenzi 2018-11-03 21:21:36 +00:00
parent 0c6333927f
commit 750c6e6059
5 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/os
View file

@ -3,4 +3,4 @@ host_group: os
baseiptables: False baseiptables: False
no_http2: True no_http2: True
nm_controlled_resolv: True nm_controlled_resolv: True
#openshift_ansible_upgrading: True openshift_ansible_upgrading: True

2
inventory/group_vars/os-stg
View file

@ -4,4 +4,4 @@ baseiptables: False
no_http2: False no_http2: False
nm_controlled_resolv: True nm_controlled_resolv: True
# Only set this when upgrading # Only set this when upgrading
openshift_ansible_upgrading: True openshift_ansible_upgrading: False

6
playbooks/groups/os-cluster.yml
View file

@ -161,13 +161,13 @@
- { - {
role: ansible-ansible-openshift-ansible, role: ansible-ansible-openshift-ansible,
cluster_inventory_filename: "cluster-inventory", cluster_inventory_filename: "cluster-inventory",
openshift_release: "v3.10", openshift_release: "v3.11",
openshift_ansible_path: "/root/openshift-ansible", openshift_ansible_path: "/root/openshift-ansible",
openshift_ansible_pre_playbook: "playbooks/prerequisites.yml", openshift_ansible_pre_playbook: "playbooks/prerequisites.yml",
openshift_ansible_playbook: "playbooks/deploy_cluster.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_ssh_user: root,
openshift_ansible_install_examples: false, openshift_ansible_install_examples: true,
openshift_ansible_containerized_deploy: false, openshift_ansible_containerized_deploy: false,
openshift_cluster_masters_group: "os-masters", openshift_cluster_masters_group: "os-masters",
openshift_cluster_nodes_group: "os-nodes", openshift_cluster_nodes_group: "os-nodes",

14
roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2
View file

@ -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. # 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. # 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.0
openshift_image_tag="v3.10" openshift_image_tag="v3.11"
# Specify an exact rpm version to install or configure. # 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. # 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. # 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.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: # If using Atomic Host, you may specify system container image registry for the nodes:
#system_images_registry="docker.io" #system_images_registry="docker.io"
@ -211,12 +211,12 @@ openshift_use_crio_only={{ openshift_ansible_crio_only }}
#openshift_docker_additional_registries=registry.example.com #openshift_docker_additional_registries=registry.example.com
# If oreg_url points to a registry requiring authentication, provide the following: # If oreg_url points to a registry requiring authentication, provide the following:
#oreg_auth_user=some_user oreg_auth_user="{{ os_prod_registry_user }}"
#oreg_auth_password='my-pass' oreg_auth_password="{{ os_prod_registry_password }}"
# NOTE: oreg_url must be defined by the user for oreg_auth_* to have any affect. # 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. # oreg_auth_pass should be generated from running docker login.
# To update registry auth credentials, uncomment the following: # To update registry auth credentials, uncomment the following:
#oreg_auth_credentials_replace: True oreg_auth_credentials_replace=True
# OpenShift repository configuration # 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'}] #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 # Specify an openshift_service_catalog image
# (defaults for origin and openshift-enterprise, repsectively) # (defaults for origin and openshift-enterprise, repsectively)
#openshift_service_catalog_image="docker.io/openshift/origin-service-catalog:{ openshift_image_tag }"" #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 # 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 # Configure one of more namespaces whose templates will be served by the TSB
openshift_template_service_broker_namespaces=['openshift'] openshift_template_service_broker_namespaces=['openshift']

1
roles/hosts/files/os-hosts
View file

@ -1,3 +1,4 @@
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
209.132.182.63 registry.access.redhat.com 209.132.182.63 registry.access.redhat.com
184.24.173.73 registry.redhat.io