diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-29 20:26:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 20:26:32 -0700 |
| commit | bc5eeede65bf02bb78e06680aa1ea40e2e6a9b19 (patch) | |
| tree | a38f02fd6c26aa095d0c895346f2090940923a8f /roles | |
| parent | db3f3817d8330139cf2bdb6f5fc67969d5390805 (diff) | |
| parent | 823d4c4e18d33cbb6dcffb122b8cc80b8766b7dd (diff) | |
| download | openshift-bc5eeede65bf02bb78e06680aa1ea40e2e6a9b19.tar.gz openshift-bc5eeede65bf02bb78e06680aa1ea40e2e6a9b19.tar.bz2 openshift-bc5eeede65bf02bb78e06680aa1ea40e2e6a9b19.tar.xz openshift-bc5eeede65bf02bb78e06680aa1ea40e2e6a9b19.zip | |
Merge pull request #5595 from mgugino-upstream-stage/reg-auth-variable-fix
Automatic merge from submit-queue.
Fix registry auth variable
There is currently a bug in registry auth
credential creation logic for openshift_node
and openshift_node_upgrade
This commit fixes the logic.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_node/tasks/registry_auth.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node_upgrade/tasks/registry_auth.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/registry_auth.yml b/roles/openshift_node/tasks/registry_auth.yml index 3d2831742..de396fb4b 100644 --- a/roles/openshift_node/tasks/registry_auth.yml +++ b/roles/openshift_node/tasks/registry_auth.yml @@ -21,4 +21,4 @@ when: - openshift.common.is_containerized | bool - oreg_auth_user is defined - - (node_oreg_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace or oreg_auth_credentials_replace.changed) | bool + - (node_oreg_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace or node_oreg_auth_credentials_create.changed) | bool diff --git a/roles/openshift_node_upgrade/tasks/registry_auth.yml b/roles/openshift_node_upgrade/tasks/registry_auth.yml index 3d2831742..de396fb4b 100644 --- a/roles/openshift_node_upgrade/tasks/registry_auth.yml +++ b/roles/openshift_node_upgrade/tasks/registry_auth.yml @@ -21,4 +21,4 @@ when: - openshift.common.is_containerized | bool - oreg_auth_user is defined - - (node_oreg_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace or oreg_auth_credentials_replace.changed) | bool + - (node_oreg_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace or node_oreg_auth_credentials_create.changed) | bool |