cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Re-fixing ability to have empty json files after inventory refactoring

Browse source
This commit is contained in:
James Cammarata 2014-07-11 13:19:36 -05:00
parent 5e0d07c93e
commit db96344966
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/utils/__init__.py
View file

@ -1281,9 +1281,11 @@ def _load_vars_from_path(path, results, vault_password=None):
# regular file # regular file
elif stat.S_ISREG(pathstat.st_mode): elif stat.S_ISREG(pathstat.st_mode):
data = parse_yaml_from_file(path, vault_password=vault_password) data = parse_yaml_from_file(path, vault_password=vault_password)
if type(data) != dict: if data and type(data) != dict:
raise errors.AnsibleError( raise errors.AnsibleError(
"%s must be stored as a dictionary/hash" % path) "%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 # combine vars overrides by default but can be configured to do a
# hash merge in settings # hash merge in settings