ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-03 07:41:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix vars hostname fallback

Browse source 
also made it optimistic, rely on exceptions instead of copmlex if chains
This commit is contained in:
Brian Coca 2018-06-21 17:15:42 -04:00 • committed by Brian Coca
parent 9a18385fab
commit 11dbed1350
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/plugins/lookup/vars.py
View file

@ -78,15 +78,15 @@ class LookupModule(LookupBase):
raise AnsibleError('Invalid setting identifier, "%s" is not a string, its a %s' % (term, type(term))) raise AnsibleError('Invalid setting identifier, "%s" is not a string, its a %s' % (term, type(term)))
try: try:
if term in myvars: try:
value = myvars[term] value = myvars[term]
elif 'hostvars' in myvars and term in myvars['hostvars']: except KeyError:
# maybe it is a host var? try:
value = myvars['hostvars'][term] value = myvars['hostvars'][myvars['inventory_hostname']][term]
else: except KeyError:
raise AnsibleUndefinedVariable('No variable found with this name: %s' % term) raise AnsibleUndefinedVariable('No variable found with this name: %s' % term)
ret.append(self._templar.template(value, fail_on_undefined=True))
ret.append(self._templar.template(value, fail_on_undefined=True))
except AnsibleUndefinedVariable: except AnsibleUndefinedVariable:
if default is not None: if default is not None:
ret.append(default) ret.append(default)