From 0c1df9770c9ed2fd804b2c09096c9de596b1a335 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
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_master/tasks/registry_auth.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'roles/openshift_master/tasks')

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
-- 
cgit v1.2.3