From 520ae1d28e2c76920ab59faaa0ca3a0b9accf5fe Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Tue, 17 Mar 2020 21:57:05 +0530
Subject: [PATCH] Pass container_config to get_config()

Change-Id: I1fbe7deaa0eb0106d2e81fa9734088fccf2a3b81
Closes-Bug: #1867798
---
 tripleoclient/utils.py                     | 5 +++--
 tripleoclient/v1/overcloud_ffwd_upgrade.py | 4 +++-
 tripleoclient/v1/overcloud_update.py       | 4 +++-
 tripleoclient/v1/overcloud_upgrade.py      | 4 +++-
 tripleoclient/workflows/deployment.py      | 9 ++++++---
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py
index ac4040627..b7712cf35 100644
--- a/tripleoclient/utils.py
+++ b/tripleoclient/utils.py
@@ -1407,7 +1407,7 @@ def load_environment_directories(directories):
     return environments
 
 
-def get_config(clients, container):
+def get_config(clients, container, container_config):
     """Get cloud config.
 
     :param clients: Application client object.
@@ -1418,7 +1418,8 @@ def get_config(clients, container):
     """
 
     context = clients.tripleoclient.create_mistral_context()
-    config_action = config.GetOvercloudConfig(container=container)
+    config_action = config.GetOvercloudConfig(
+        container=container, container_config=container_config)
     config_action.run(context=context)
 
 
diff --git a/tripleoclient/v1/overcloud_ffwd_upgrade.py b/tripleoclient/v1/overcloud_ffwd_upgrade.py
index 529546cf7..b3120d129 100644
--- a/tripleoclient/v1/overcloud_ffwd_upgrade.py
+++ b/tripleoclient/v1/overcloud_ffwd_upgrade.py
@@ -99,7 +99,9 @@ class FFWDUpgradePrepare(DeployOvercloud):
 
         super(FFWDUpgradePrepare, self).take_action(parsed_args)
         package_update.update(clients, container=stack_name)
-        oooutils.get_config(clients, container=stack_name)
+        oooutils.get_config(
+            clients, container=stack_name,
+            container_config='{}-config'.format(stack.stack_name))
 
         overcloudrcs = deployment.create_overcloudrc(
             clients, container=stack_name)
diff --git a/tripleoclient/v1/overcloud_update.py b/tripleoclient/v1/overcloud_update.py
index 03e923e97..6676da0d6 100644
--- a/tripleoclient/v1/overcloud_update.py
+++ b/tripleoclient/v1/overcloud_update.py
@@ -74,7 +74,9 @@ class UpdatePrepare(DeployOvercloud):
 
         super(UpdatePrepare, self).take_action(parsed_args)
         package_update.update(clients, container=stack_name)
-        oooutils.get_config(clients, container=stack_name)
+        oooutils.get_config(
+            clients, container=stack_name,
+            container_config='{}-config'.format(stack.stack_name))
         self.log.info("Update init on stack {0} complete.".format(
                       parsed_args.stack))
 
diff --git a/tripleoclient/v1/overcloud_upgrade.py b/tripleoclient/v1/overcloud_upgrade.py
index 53391fa93..9460bb425 100644
--- a/tripleoclient/v1/overcloud_upgrade.py
+++ b/tripleoclient/v1/overcloud_upgrade.py
@@ -73,7 +73,9 @@ class UpgradePrepare(DeployOvercloud):
             constants.UPGRADE_PREPARE_ENV)
         super(UpgradePrepare, self).take_action(parsed_args)
         package_update.update(clients, container=stack_name)
-        oooutils.get_config(clients, container=stack_name)
+        oooutils.get_config(
+            clients, container=stack_name,
+            container_config='{}-config'.format(stack.stack_name))
 
         overcloudrcs = deployment.create_overcloudrc(
             clients, container=stack_name)
diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py
index 6a55e3ff2..2c51a23a6 100644
--- a/tripleoclient/workflows/deployment.py
+++ b/tripleoclient/workflows/deployment.py
@@ -382,7 +382,10 @@ def config_download(log, clients, stack, ssh_network=None,
         logger=log,
         print_msg=(verbosity == 0)
     )
-    utils.get_config(clients, container=stack.stack_name)
+    container_config = '{}-config'.format(stack.stack_name)
+
+    utils.get_config(clients, container=stack.stack_name,
+                     container_config=container_config)
     _log_and_print(
         message='Downloading configuration for stack: {}'.format(
             stack.stack_name
@@ -392,8 +395,8 @@ def config_download(log, clients, stack, ssh_network=None,
     )
     download = config.DownloadConfigAction(
         work_dir=stack_work_dir,
-        container_config='{}-config'.format(stack.stack_name)
-    )
+        container_config=container_config)
+
     work_dir = download.run(context=context)
     _log_and_print(
         message='Retrieving keyfile for stack: {}'.format(