diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-24 11:59:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 11:59:31 -0700 |
| commit | abb5b1c5b899a121b8d2990b33880c93cd46ac88 (patch) | |
| tree | 9c6d410862ea50c783212e262cc162b0800df0cf /playbooks/common/openshift-cluster/upgrades | |
| parent | d9cfebd1196815542c945e3f217581bbbfc61eaa (diff) | |
| parent | 1f0690622de8f26667d40a838298e63ffd3887f5 (diff) | |
| download | openshift-abb5b1c5b899a121b8d2990b33880c93cd46ac88.tar.gz openshift-abb5b1c5b899a121b8d2990b33880c93cd46ac88.tar.bz2 openshift-abb5b1c5b899a121b8d2990b33880c93cd46ac88.tar.xz openshift-abb5b1c5b899a121b8d2990b33880c93cd46ac88.zip | |
Merge pull request #5814 from mgugino-upstream-stage/docker-auth-upgrades
Automatic merge from submit-queue.
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/openshift-cluster/upgrades')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml | 6 |
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 b9b3d323a..13fa37b09 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 }} |