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/675804/
Closes-Bug: #1838540
Change-Id: I993fc09fd571fb93d78ffdbecf1823e806f744f4
(cherry picked from commit ac7ae9e8d6
)
This commit is contained in:
parent
4d0c4ab51c
commit
17079abbbb
|
@ -969,6 +969,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
|
||||||
|
|
||||||
disabled_val = parsed_args.disable_validations
|
disabled_val = parsed_args.disable_validations
|
||||||
enable_val = parsed_args.run_validations
|
enable_val = parsed_args.run_validations
|
||||||
|
|
||||||
|
@ -981,6 +986,7 @@ class DeployOvercloud(command.Command):
|
||||||
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,
|
||||||
in_flight_validations=(enable_val or not disabled_val))
|
in_flight_validations=(enable_val or not disabled_val))
|
||||||
except Exception:
|
except Exception:
|
||||||
deployment.set_deployment_status(
|
deployment.set_deployment_status(
|
||||||
|
|
|
@ -312,6 +312,7 @@ 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={},
|
||||||
in_flight_validations=True):
|
in_flight_validations=True):
|
||||||
workflow_client = clients.workflow_engine
|
workflow_client = clients.workflow_engine
|
||||||
tripleoclients = clients.tripleoclient
|
tripleoclients = clients.tripleoclient
|
||||||
|
@ -326,6 +327,7 @@ def config_download(log, clients, stack, templates,
|
||||||
'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,
|
||||||
'skip_tags': skip_tags
|
'skip_tags': skip_tags
|
||||||
}
|
}
|
||||||
if output_dir:
|
if output_dir:
|
||||||
|
|
Loading…
Reference in New Issue