openstack
/
python-tripleoclient
Code Issues Proposed changes

Remove ANSIBLE_STDOUT_CALLBACK override 

That PR has merged long time back and we're using
ansible-runner 2.2.0 since a long time.

Change-Id: I1b9d6e87635dd2f0be39780dcee998fe3f1f02b6
This commit is contained in:
rabi 2022-11-16 08:53:12 +05:30 committed by Rabi Mishra
parent 4429d31c86
commit d18b927385
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/utils.py
View File

@ -629,14 +629,6 @@ def run_ansible_playbook(playbook, inventory, workdir, playbook_dir=None,
runner_config = ansible_runner.runner_config.RunnerConfig(**r_opts)
runner_config.prepare()
# NOTE(cloudnull): overload the output callback after prepare
# to define the specific format we want.
# This is only required until PR
# https://github.com/ansible/ansible-runner/pull/387
# is merged and released. After this PR has been
# made available to us, this line should be removed.
runner_config.env['ANSIBLE_STDOUT_CALLBACK'] = \
r_opts['envvars']['ANSIBLE_STDOUT_CALLBACK']
runner = ansible_runner.Runner(config=runner_config)
if reproduce_command:

3
tripleoclient/v2/tripleo_container_image.py
View File

@ -700,7 +700,8 @@ class Build(command.Command):
workdir=tmp,
playbook_dir=tmp,
extra_env_variables={
"ANSIBLE_FORKS": len(tcib_inventory_hosts.keys())
"ANSIBLE_FORKS": len(tcib_inventory_hosts.keys()),
"ANSIBLE_PYTHON_INTERPRETER": "{{ansible_playbook_python}}"
},
verbosity=utils.playbook_verbosity(self=self),
)