|
|
@ -190,7 +190,7 @@ class VariableManager:
|
|
|
|
|
|
|
|
|
|
|
|
if play:
|
|
|
|
if play:
|
|
|
|
all_vars = self._combine_vars(all_vars, play.get_vars())
|
|
|
|
all_vars = self._combine_vars(all_vars, play.get_vars())
|
|
|
|
|
|
|
|
|
|
|
|
for vars_file_item in play.get_vars_files():
|
|
|
|
for vars_file_item in play.get_vars_files():
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
# create a set of temporary vars here, which incorporate the
|
|
|
|
# create a set of temporary vars here, which incorporate the
|
|
|
@ -215,11 +215,6 @@ 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 AnsibleError, e:
|
|
|
|
|
|
|
|
# FIXME: get_vars should probably be taking a flag to determine
|
|
|
|
|
|
|
|
# whether or not vars files errors should be fatal at this
|
|
|
|
|
|
|
|
# stage, or just base it on whether a host was specified?
|
|
|
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
except UndefinedError, e:
|
|
|
|
except UndefinedError, e:
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
|
|