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

allow empty files in host/group_vars

Browse source 
also remove unused import
fixes #24963
This commit is contained in:
Brian Coca 2017-05-24 09:31:44 -04:00
parent 4b6db5db7c
commit daef6f0911
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/plugins/vars/host_group_vars.py
View file

@ -36,7 +36,6 @@ from ansible import constants as C
from ansible.errors import AnsibleParserError
from ansible.module_utils._text import to_bytes, to_text
from ansible.plugins.vars import BaseVarsPlugin
from ansible.utils.path import basedir
from ansible.inventory.host import Host
from ansible.inventory.group import Group
from ansible.utils.vars import combine_vars
@ -71,7 +70,9 @@ class VarsModule(BaseVarsPlugin):
self._display.debug("\tprocessing dir %s" % opath)
for found in self._find_vars_files(opath, entity.name):
self._display.debug("READING %s" % found)
data = combine_vars(data, loader.load_from_file(found, cache=True, unsafe=True))
new_data = loader.load_from_file(found, cache=True, unsafe=True)
if new_data: # ignore empty files
data = combine_vars(data, new_data)
else:
self._display.warning("Found %s that is not a directory, skipping: %s" % (subdir, opath))