mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
parent
51e014d915
commit
ff04b2b532
3 changed files with 7 additions and 6 deletions
|
@ -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)
|
||||
|
|
|
@ -332,7 +332,6 @@ class Play(object):
|
|||
if new_default_vars:
|
||||
if type(new_default_vars) != dict:
|
||||
raise errors.AnsibleError("%s must be stored as dictionary/hash: %s" % (filename, type(new_default_vars)))
|
||||
|
||||
default_vars = utils.combine_vars(default_vars, new_default_vars)
|
||||
|
||||
return default_vars
|
||||
|
|
|
@ -44,8 +44,10 @@ class ActionModule(object):
|
|||
|
||||
if os.path.exists(source):
|
||||
data = utils.parse_yaml_from_file(source, vault_password=self.runner.vault_pass)
|
||||
if type(data) != dict:
|
||||
if data and type(data) != dict:
|
||||
raise errors.AnsibleError("%s must be stored as a dictionary/hash" % source)
|
||||
elif data is None:
|
||||
data = {}
|
||||
result = dict(ansible_facts=data)
|
||||
return ReturnData(conn=conn, comm_ok=True, result=result)
|
||||
else:
|
||||
|
|
Loading…
Reference in a new issue