Skip to content

A
ansible
Commit 50586928 by Michael DeHaan
Options

No need for trailing semicolon.

parent ea8302e6
Showing with 2 additions and 2 deletions
lib/ansible/inventory/vars_plugins/group_vars.py
...@@ -51,7 +51,7 @@ class VarsModule(object): ...@@ -51,7 +51,7 @@ class VarsModule(object):
data = utils.parse_yaml_from_file(path) data = utils.parse_yaml_from_file(path)
if type(data) != dict: if type(data) != dict:
raise errors.AnsibleError("%s must be stored as a dictionary/hash" % path) raise errors.AnsibleError("%s must be stored as a dictionary/hash" % path)
results = utils.combine_vars(results, data); results = utils.combine_vars(results, data)
# load vars in inventory_dir/hosts_vars/name_of_host # load vars in inventory_dir/hosts_vars/name_of_host
p = os.path.join(basedir, "host_vars/%s" % host.name) p = os.path.join(basedir, "host_vars/%s" % host.name)
...@@ -61,7 +61,7 @@ class VarsModule(object): ...@@ -61,7 +61,7 @@ class VarsModule(object):
data = utils.parse_yaml_from_file(path) data = utils.parse_yaml_from_file(path)
if type(data) != dict: if type(data) != dict:
raise errors.AnsibleError("%s must be stored as a dictionary/hash" % path) raise errors.AnsibleError("%s must be stored as a dictionary/hash" % path)
results = utils.combine_vars(results, data); results = utils.combine_vars(results, data)
return results return results
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