Also catch AnsibleUndefinedVariable errors when templating vars_files names

Fixes #12449
pull/12452/head
James Cammarata 9 years ago
parent d851df3b31
commit 8769f03c16

@ -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:

Loading…
Cancel
Save