From 6daf1ec47e8aade95db97ef0c0f0032e5f411510 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 2 Nov 2018 21:18:07 +0000 Subject: [PATCH] Openshift 3.11 switches to registry.redhat.io, which requires auth. --- .../templates/cluster-inventory-stg.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 b549110447..0d08fe3a30 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 @@ -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_stg_registry_user }}" +oreg_auth_password="{{ os_stg_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'}]