openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Pass deployment_options to config download"

Browse Source
This commit is contained in:
Zuul 2019-08-01 18:01:25 +00:00 committed by Gerrit Code Review
commit c10329fc0e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/v1/overcloud_deploy.py
View File

@ -910,6 +910,11 @@ class DeployOvercloud(command.Command):
used = int(time.time() - start) used = int(time.time() - start)
timeout = (parsed_args.timeout * 60) - used timeout = (parsed_args.timeout * 60) - used
deployment_options = {}
if parsed_args.deployment_python_interpreter:
deployment_options['ansible_python_interpreter'] = \
parsed_args.deployment_python_interpreter
deployment.config_download( deployment.config_download(
self.log, self.clients, stack, self.log, self.clients, stack,
parsed_args.templates, parsed_args.overcloud_ssh_user, parsed_args.templates, parsed_args.overcloud_ssh_user,
@ -918,7 +923,8 @@ class DeployOvercloud(command.Command):
parsed_args.output_dir, parsed_args.output_dir,
parsed_args.override_ansible_cfg, parsed_args.override_ansible_cfg,
timeout, timeout,
verbosity=self.app_args.verbose_level) verbosity=self.app_args.verbose_level,
deployment_options=deployment_options)
except Exception: except Exception:
deployment.set_deployment_status( deployment.set_deployment_status(
self.clients, 'failed', self.clients, 'failed',

6
tripleoclient/workflows/deployment.py
View File

@ -316,7 +316,8 @@ def enable_ssh_admin(log, clients, plan_name, hosts, ssh_user, ssh_key):
def config_download(log, clients, stack, templates, def config_download(log, clients, stack, templates,
ssh_user, ssh_key, ssh_network, ssh_user, ssh_key, ssh_network,
output_dir, override_ansible_cfg, timeout, verbosity=1): output_dir, override_ansible_cfg, timeout, verbosity=1,
deployment_options={}):
workflow_client = clients.workflow_engine workflow_client = clients.workflow_engine
tripleoclients = clients.tripleoclient tripleoclients = clients.tripleoclient
@ -324,7 +325,8 @@ def config_download(log, clients, stack, templates,
'verbosity': verbosity, 'verbosity': verbosity,
'plan_name': stack.stack_name, 'plan_name': stack.stack_name,
'ssh_network': ssh_network, 'ssh_network': ssh_network,
'config_download_timeout': timeout 'config_download_timeout': timeout,
'deployment_options': deployment_options,
} }
if output_dir: if output_dir:
workflow_input.update(dict(work_dir=output_dir)) workflow_input.update(dict(work_dir=output_dir))