From 0c1df9770c9ed2fd804b2c09096c9de596b1a335 Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Tue, 5 Dec 2017 12:04:15 -0500 Subject: Fix oreg_auth_credentials_create register var There is a variable collision for the *oreg_auth_credentials_create variables in openshift_master and openshift_node registry_create tasks. This commit ensures standard and alternative oreg auth credential placement tasks don't use the same register variable. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1520866 --- roles/openshift_node/tasks/registry_auth.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'roles/openshift_node') 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 -- cgit v1.2.1