diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-05 12:55:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 12:55:45 -0500 |
| commit | e64cc7d416e8121dcda25be05da9ec3c5b6899eb (patch) | |
| tree | 91b2c05dffe5ff6b3331b1d7612287cd6cdbc7f0 | |
| parent | 40ccc162de50107c6b1db06ca0c96aa949698f9f (diff) | |
| parent | 0c1df9770c9ed2fd804b2c09096c9de596b1a335 (diff) | |
| download | openshift-e64cc7d416e8121dcda25be05da9ec3c5b6899eb.tar.gz openshift-e64cc7d416e8121dcda25be05da9ec3c5b6899eb.tar.bz2 openshift-e64cc7d416e8121dcda25be05da9ec3c5b6899eb.tar.xz openshift-e64cc7d416e8121dcda25be05da9ec3c5b6899eb.zip | |
Merge pull request #6357 from mgugino-upstream-stage/fix-container-reg-auth
Fix oreg_auth_credentials_create register var
| -rw-r--r-- | roles/openshift_master/tasks/registry_auth.yml | 8 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/registry_auth.yml | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/roles/openshift_master/tasks/registry_auth.yml b/roles/openshift_master/tasks/registry_auth.yml index c95f562d0..ca04d2243 100644 --- a/roles/openshift_master/tasks/registry_auth.yml +++ b/roles/openshift_master/tasks/registry_auth.yml @@ -33,7 +33,7 @@ - openshift_docker_alternative_creds | default(False) | bool - oreg_auth_user is defined - (not docker_cli_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace) | bool - register: master_oreg_auth_credentials_create + register: master_oreg_auth_credentials_create_alt notify: - restart master api - restart master controllers @@ -45,4 +45,8 @@ when: - openshift.common.is_containerized | bool - oreg_auth_user is defined - - (master_oreg_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace or master_oreg_auth_credentials_create.changed) | bool + - > + (master_oreg_auth_credentials_stat.stat.exists + or oreg_auth_credentials_replace + or master_oreg_auth_credentials_create.changed + or master_oreg_auth_credentials_create_alt.changed) | bool diff --git a/roles/openshift_node/tasks/registry_auth.yml b/roles/openshift_node/tasks/registry_auth.yml index f5428867a..ab43ec049 100644 --- a/roles/openshift_node/tasks/registry_auth.yml +++ b/roles/openshift_node/tasks/registry_auth.yml @@ -32,7 +32,7 @@ - openshift_docker_alternative_creds | bool - oreg_auth_user is defined - (not node_oreg_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace) | bool - register: node_oreg_auth_credentials_create + register: node_oreg_auth_credentials_create_alt notify: - restart node @@ -43,4 +43,8 @@ when: - openshift.common.is_containerized | bool - oreg_auth_user is defined - - (node_oreg_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace or node_oreg_auth_credentials_create.changed) | bool + - > + (node_oreg_auth_credentials_stat.stat.exists + or oreg_auth_credentials_replace + or node_oreg_auth_credentials_create.changed + or node_oreg_auth_credentials_create_alt.changed) | bool |