summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2015-09-21 09:32:35 -0400
committerJames Cammarata <jimi@sngx.net>2015-09-21 09:35:06 -0400
commit8769f03c1679728650e93d93ef0b6f7a13bd370a (patch)
tree335945c5933d86c31c685c4eeec5b2bf3d19a719
parentd851df3b311bfe8f5607340af84681c243c7fc7a (diff)
downloadansible-8769f03c1679728650e93d93ef0b6f7a13bd370a.tar.gz
Also catch AnsibleUndefinedVariable errors when templating vars_files names
Fixes #12449
-rw-r--r--lib/ansible/vars/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/vars/__init__.py b/lib/ansible/vars/__init__.py
index d31fd43581..c83d07542c 100644
--- a/lib/ansible/vars/__init__.py
+++ b/lib/ansible/vars/__init__.py
@@ -33,7 +33,7 @@ except ImportError:
from ansible import constants as C
from ansible.cli import CLI
-from ansible.errors import AnsibleError
+from ansible.errors import AnsibleError, AnsibleUndefinedVariable
from ansible.inventory.host import Host
from ansible.parsing import DataLoader
from ansible.plugins.cache import FactCache
@@ -238,7 +238,7 @@ class VariableManager:
break
else:
raise AnsibleError("vars file %s was not found" % vars_file_item)
- except UndefinedError:
+ except (UndefinedError, AnsibleUndefinedVariable):
continue
if not C.DEFAULT_PRIVATE_ROLE_VARS: