Commit b38f8bfa by Michael DeHaan

Merge pull request #620 from pas256/patch-1

Conditional Imports should only import the first vars_file found in list
parents 8bb8314d 413fb15e
...@@ -232,6 +232,8 @@ class Play(object): ...@@ -232,6 +232,8 @@ class Play(object):
self.vars.update(data) self.vars.update(data)
elif host is not None: elif host is not None:
self.playbook.callbacks.on_not_import_for_host(host, filename4) self.playbook.callbacks.on_not_import_for_host(host, filename4)
if found
break
if not found: if not found:
raise errors.AnsibleError( raise errors.AnsibleError(
"%s: FATAL, no files matched for vars_files import sequence: %s" % (host, sequence) "%s: FATAL, no files matched for vars_files import sequence: %s" % (host, sequence)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment