From d18b9273859dc2c5909104f1aa7dab0c2c4f982e Mon Sep 17 00:00:00 2001 From: rabi Date: Wed, 16 Nov 2022 08:53:12 +0530 Subject: [PATCH] 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 --- tripleoclient/utils.py | 8 -------- tripleoclient/v2/tripleo_container_image.py | 3 ++- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py index e41818ad4..4e0f479ce 100644 --- a/tripleoclient/utils.py +++ b/tripleoclient/utils.py @@ -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: diff --git a/tripleoclient/v2/tripleo_container_image.py b/tripleoclient/v2/tripleo_container_image.py index a6ee06e21..46d18f34f 100644 --- a/tripleoclient/v2/tripleo_container_image.py +++ b/tripleoclient/v2/tripleo_container_image.py @@ -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), )