openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Pass the python interpreter to the play command directly"

Browse Source
This commit is contained in:
Zuul 2019-01-17 18:09:27 +00:00 committed by Gerrit Code Review
commit 57b40b24da
1 changed files with 6 additions and 4 deletions

10
tripleoclient/utils.py

@ -110,16 +110,18 @@ def run_ansible_playbook(logger,
elif os.path.exists(os.path.join(workdir, ansible_config)): elif os.path.exists(os.path.join(workdir, ansible_config)):
env['ANSIBLE_CONFIG'] = os.path.join(workdir, ansible_config) env['ANSIBLE_CONFIG'] = os.path.join(workdir, ansible_config)
if python_interpreter is not None:
env['ANSIBLE_PYTHON_INTERPRETER'] = python_interpreter
play = os.path.join(workdir, playbook) play = os.path.join(workdir, playbook)
if os.path.exists(play): if os.path.exists(play):
cmd = ["ansible-playbook-{}".format(sys.version_info[0]), cmd = ["ansible-playbook-{}".format(sys.version_info[0]),
'-i', inventory, '-i', inventory,
'-c', connection, play
] ]
if python_interpreter is not None:
cmd.extend(['-e', 'ansible_python_interpreter=%s' %
python_interpreter])
cmd.extend(['-c', connection, play])
proc = run_command_and_log(logger, cmd, env=env, retcode_only=False) proc = run_command_and_log(logger, cmd, env=env, retcode_only=False)
proc.wait() proc.wait()
cleanup and os.unlink(tmp_config) cleanup and os.unlink(tmp_config)