summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-10-19 11:25:47 -0400
committerMichael Gugino <mgugino@redhat.com>2017-10-19 11:31:18 -0400
commit1f0690622de8f26667d40a838298e63ffd3887f5 (patch)
tree3f88fad5478fa1d565d6b55fb6d5643868608ffd /playbooks/common
parent64f452f9081e380db41acf588a28fe4bb79a4e9e (diff)
downloadopenshift-1f0690622de8f26667d40a838298e63ffd3887f5.tar.gz
openshift-1f0690622de8f26667d40a838298e63ffd3887f5.tar.bz2
openshift-1f0690622de8f26667d40a838298e63ffd3887f5.tar.xz
openshift-1f0690622de8f26667d40a838298e63ffd3887f5.zip
Enable oreg_auth credential replace during upgrades
Currently, upgrades run a docker image pull prior to upgrading masters and nodes for containerized installs. If using a secure registry, and a user wishes to upgrade their credentials due to expiry, the image pull will fail. This commit ensures docker login credentials are updated during upgrades, if necessary. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503995
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml b/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml
index 142ce5f3d..759beb1f9 100644
--- a/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml
+++ b/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml
@@ -4,6 +4,12 @@
msg: Verify OpenShift is already installed
when: openshift.common.version is not defined
+- name: Update oreg_auth docker login credentials if necessary
+ include_role:
+ name: docker
+ tasks_from: registry_auth.yml
+ when: oreg_auth_user is defined
+
- name: Verify containers are available for upgrade
command: >
docker pull {{ openshift.common.cli_image }}:{{ openshift_image_tag }}