openstack
/
validations-libs
Code Issues Proposed changes

Merge "Style adjustment of a constant."

This commit is contained in:
Zuul 2021-03-03 08:52:20 +00:00 committed by Gerrit Code Review
parent a5fcd54131 172a49584a
commit 73b8a373ad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
validations_libs/ansible.py
View File

@ -39,9 +39,9 @@ except NameError:
try: try:
version = pkg_resources.get_distribution("ansible_runner").version version = pkg_resources.get_distribution("ansible_runner").version
backward_compat = (version < '1.4.0') BACKWARD_COMPAT = (version < '1.4.0')
except pkg_resources.DistributionNotFound: except pkg_resources.DistributionNotFound:
backward_compat = False BACKWARD_COMPAT = False
class Ansible(object): class Ansible(object):
@ -428,7 +428,7 @@ class Ansible(object):
'ident': '' 'ident': ''
} }
if not backward_compat: if not BACKWARD_COMPAT:
r_opts.update({ r_opts.update({
'envvars': envvars, 'envvars': envvars,
'project_dir': playbook_dir, 'project_dir': playbook_dir,
@ -453,7 +453,7 @@ class Ansible(object):
runner_config.prepare() runner_config.prepare()
runner_config.env['ANSIBLE_STDOUT_CALLBACK'] = \ runner_config.env['ANSIBLE_STDOUT_CALLBACK'] = \
envvars['ANSIBLE_STDOUT_CALLBACK'] envvars['ANSIBLE_STDOUT_CALLBACK']
if backward_compat: if BACKWARD_COMPAT:
runner_config.env.update(envvars) runner_config.env.update(envvars)
runner = ansible_runner.Runner(config=runner_config) runner = ansible_runner.Runner(config=runner_config)