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

Also catch AnsibleUndefinedVariable errors when templating vars_files names

Browse source 
Fixes #12449
This commit is contained in:
James Cammarata 2015-09-21 09:32:35 -04:00
parent d851df3b31
commit 8769f03c16
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/vars/__init__.py
View file

@ -33,7 +33,7 @@ except ImportError:
from ansible import constants as C from ansible import constants as C
from ansible.cli import CLI from ansible.cli import CLI
from ansible.errors import AnsibleError from ansible.errors import AnsibleError, AnsibleUndefinedVariable
from ansible.inventory.host import Host from ansible.inventory.host import Host
from ansible.parsing import DataLoader from ansible.parsing import DataLoader
from ansible.plugins.cache import FactCache from ansible.plugins.cache import FactCache
@ -238,7 +238,7 @@ class VariableManager:
break break
else: else:
raise AnsibleError("vars file %s was not found" % vars_file_item) raise AnsibleError("vars file %s was not found" % vars_file_item)
except UndefinedError: except (UndefinedError, AnsibleUndefinedVariable):
continue continue
if not C.DEFAULT_PRIVATE_ROLE_VARS: if not C.DEFAULT_PRIVATE_ROLE_VARS: