cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Expose verbosity as a var, dedupe attr list. Fixes #36170

Browse source
This commit is contained in:
Matt Martz 2018-04-03 11:37:16 -05:00 committed by Brian Coca
parent 0d31d1cd24
commit b794fa4fe7
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/utils/vars.py
View file

@ -146,16 +146,19 @@ def load_extra_vars(loader, options):
def load_options_vars(options, version):
options_vars = {'ansible_version': version}
aliases = {'check': 'check_mode',
'diff': 'diff_mode',
'inventory': 'inventory_sources',
'subset': 'limit',
'tags': 'run_tags'}
attrs = {'check': 'check_mode',
'diff': 'diff_mode',
'forks': 'forks',
'inventory': 'inventory_sources',
'skip_tags': 'skip_tags',
'subset': 'limit',
'tags': 'run_tags',
'verbosity': 'verbosity'}
for attr in ('check', 'diff', 'forks', 'inventory', 'skip_tags', 'subset', 'tags'):
for attr, alias in attrs.items():
opt = getattr(options, attr, None)
if opt is not None:
options_vars['ansible_%s' % aliases.get(attr, attr)] = opt
options_vars['ansible_%s' % alias] = opt
return options_vars