openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Ensure playbook execution respects CLI ENV vars"

This commit is contained in:
Zuul 2020-05-19 20:18:50 +00:00 committed by Gerrit Code Review
parent 7e57642904 6a6b7526fb
commit dc7ab4b015
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleoclient/utils.py
View File

@ -460,7 +460,7 @@ def run_ansible_playbook(playbook, inventory, workdir, playbook_dir=None,
callback_whitelist = ','.join([callback_whitelist, 'profile_tasks'])
env = os.environ.copy()
env = dict()
env['ANSIBLE_SSH_ARGS'] = (
'-o UserKnownHostsFile={} '
'-o StrictHostKeyChecking=no '
@ -596,6 +596,10 @@ def run_ansible_playbook(playbook, inventory, workdir, playbook_dir=None,
if key:
env['ANSIBLE_PRIVATE_KEY_FILE'] = key
# NOTE(cloudnull): Re-apply the original environment ensuring that
# anything defined on the CLI is set accordingly.
env.update(os.environ.copy())
if extra_env_variables:
if not isinstance(extra_env_variables, dict):
msg = "extra_env_variables must be a dict"