From ac7ae9e8d638676196c4897a30c978d51a091900 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Wed, 31 Jul 2019 21:39:38 +0530 Subject: [PATCH] Pass deployment_options to config download https://review.opendev.org/673862 allows config_download workflow to take deployment_options as a input, this patch passes it to the workflow so ansible_python_interpreter is set correctly in generated inventory and thus used during ansible deployment. Depends-On: https://review.opendev.org/#/c/673862/ Closes-Bug: #1838540 Change-Id: I993fc09fd571fb93d78ffdbecf1823e806f744f4 --- tripleoclient/v1/overcloud_deploy.py | 8 +++++++- tripleoclient/workflows/deployment.py | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index 5ae838515..e7c2c3f71 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -986,6 +986,11 @@ class DeployOvercloud(command.Command): used = int(time.time() - start) 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( self.log, self.clients, stack, parsed_args.templates, parsed_args.overcloud_ssh_user, @@ -994,7 +999,8 @@ class DeployOvercloud(command.Command): parsed_args.output_dir, parsed_args.override_ansible_cfg, timeout, - verbosity=self.app_args.verbose_level) + verbosity=self.app_args.verbose_level, + deployment_options=deployment_options) except Exception: deployment.set_deployment_status( self.clients, 'failed', diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py index a21039184..f3f1745e6 100644 --- a/tripleoclient/workflows/deployment.py +++ b/tripleoclient/workflows/deployment.py @@ -316,7 +316,8 @@ def enable_ssh_admin(log, clients, plan_name, hosts, ssh_user, ssh_key): def config_download(log, clients, stack, templates, 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 tripleoclients = clients.tripleoclient @@ -324,7 +325,8 @@ def config_download(log, clients, stack, templates, 'verbosity': verbosity, 'plan_name': stack.stack_name, 'ssh_network': ssh_network, - 'config_download_timeout': timeout + 'config_download_timeout': timeout, + 'deployment_options': deployment_options, } if output_dir: workflow_input.update(dict(work_dir=output_dir))