openstack/python-tripleoclient
Code Issues Proposed changes

Pass container_config to get_config()

Browse Source 
Change-Id: I1fbe7deaa0eb0106d2e81fa9734088fccf2a3b81
Closes-Bug: #1867798
This commit is contained in:
Rabi Mishra 2020-03-17 21:57:05 +05:30
parent 026e98012a
commit 520ae1d28e
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tripleoclient/utils.py
View File

@ -1407,7 +1407,7 @@ def load_environment_directories(directories):
return environments return environments
def get_config(clients, container): def get_config(clients, container, container_config):
"""Get cloud config. """Get cloud config.
:param clients: Application client object. :param clients: Application client object.
@ -1418,7 +1418,8 @@ def get_config(clients, container):
""" """
context = clients.tripleoclient.create_mistral_context() 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) config_action.run(context=context)

4
tripleoclient/v1/overcloud_ffwd_upgrade.py
View File

@ -99,7 +99,9 @@ class FFWDUpgradePrepare(DeployOvercloud):
super(FFWDUpgradePrepare, self).take_action(parsed_args) super(FFWDUpgradePrepare, self).take_action(parsed_args)
package_update.update(clients, container=stack_name) 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( overcloudrcs = deployment.create_overcloudrc(
clients, container=stack_name) clients, container=stack_name)

4
tripleoclient/v1/overcloud_update.py
View File

@ -74,7 +74,9 @@ class UpdatePrepare(DeployOvercloud):
super(UpdatePrepare, self).take_action(parsed_args) super(UpdatePrepare, self).take_action(parsed_args)
package_update.update(clients, container=stack_name) 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( self.log.info("Update init on stack {0} complete.".format(
parsed_args.stack)) parsed_args.stack))

4
tripleoclient/v1/overcloud_upgrade.py
View File

@ -73,7 +73,9 @@ class UpgradePrepare(DeployOvercloud):
constants.UPGRADE_PREPARE_ENV) constants.UPGRADE_PREPARE_ENV)
super(UpgradePrepare, self).take_action(parsed_args) super(UpgradePrepare, self).take_action(parsed_args)
package_update.update(clients, container=stack_name) 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( overcloudrcs = deployment.create_overcloudrc(
clients, container=stack_name) clients, container=stack_name)

9
tripleoclient/workflows/deployment.py
View File

@ -382,7 +382,10 @@ def config_download(log, clients, stack, ssh_network=None,
logger=log, logger=log,
print_msg=(verbosity == 0) 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( _log_and_print(
message='Downloading configuration for stack: {}'.format( message='Downloading configuration for stack: {}'.format(
stack.stack_name stack.stack_name
@ -392,8 +395,8 @@ def config_download(log, clients, stack, ssh_network=None,
) )
download = config.DownloadConfigAction( download = config.DownloadConfigAction(
work_dir=stack_work_dir, work_dir=stack_work_dir,
container_config='{}-config'.format(stack.stack_name) container_config=container_config)
)
work_dir = download.run(context=context) work_dir = download.run(context=context)
_log_and_print( _log_and_print(
message='Retrieving keyfile for stack: {}'.format( message='Retrieving keyfile for stack: {}'.format(