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

openshift: Update to latest openshift ansible and containers.

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2019-09-19 17:14:43 +00:00 • committed by Pierre-Yves Chibon
parent a562b8a3f8
commit 1502d91813
3 changed files with 11 additions and 11 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
no_http2: True
nm_controlled_resolv: True
#openshift_ansible_upgrading: True
openshift_ansible_upgrading: True

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

@ -165,7 +165,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.51-1",
openshift_ansible_version: "openshift-ansible-3.11.145-1",
openshift_ansible_ssh_user: root,
openshift_ansible_install_examples: true,
openshift_ansible_containerized_deploy: false,

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

@ -100,7 +100,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.43"
openshift_pkg_version="-3.11.117"
# If using Atomic Host, you may specify system container image registry for the nodes:
#system_images_registry="docker.io"
@ -717,12 +717,12 @@ openshift_logging_es_nodeselector={"node-role.kubernetes.io/infra":"true"}
#openshift_logging_storage_volume_name=logging
#openshift_logging_storage_volume_size=10Gi
#openshift_logging_storage_labels={'storage': 'logging'}
openshift_hosted_logging_storage_kind=nfs
openshift_hosted_logging_storage_access_modes=['ReadWriteOnce']
openshift_hosted_logging_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com
openshift_hosted_logging_storage_nfs_directory=/
openshift_hosted_logging_storage_volume_name=openshift_prod_logging
openshift_hosted_logging_storage_volume_size=100Gi
openshift_logging_storage_kind=nfs
openshift_logging_storage_access_modes=['ReadWriteOnce']
openshift_logging_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com
openshift_logging_storage_nfs_directory=/
openshift_logging_storage_volume_name=openshift_prod_logging
openshift_logging_storage_volume_size=100Gi
#
# Option C - Dynamic -- If openshift supports dynamic volume provisioning for
# your cloud platform use this.
@ -969,10 +969,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.43"
openshift_service_catalog_image="registry.access.redhat.com/openshift3/ose-service-catalog:v3.11.117"
# TSB image tag
template_service_broker_version='v3.11.43'
template_service_broker_version='v3.11.117'
# Configure one of more namespaces whose templates will be served by the TSB
openshift_template_service_broker_namespaces=['openshift']