Allow empty yaml vars files

Fixes #7843
This commit is contained in:
James Cammarata 2014-07-04 22:59:00 -05:00
commit ff04b2b532
3 changed files with 7 additions and 6 deletions

View file

@ -91,10 +91,10 @@ def _load_vars_from_path(path, results, vault_password=None):
# regular file
elif stat.S_ISREG(pathstat.st_mode):
data = utils.parse_yaml_from_file(path, vault_password=vault_password)
if type(data) != dict:
raise errors.AnsibleError(
"%s must be stored as a dictionary/hash" % path)
if data and type(data) != dict:
raise errors.AnsibleError("%s must be stored as a dictionary/hash" % path)
elif data is None:
data = {}
# combine vars overrides by default but can be configured to do a
# hash merge in settings
results = utils.combine_vars(results, data)