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

Allow '.yml'/'.yaml' extension on group_vars files.

Browse source 
Look for a file with the base name of the group/host, first without
a file extension, then with a '.yml' extension, and, finally, with
a '.yaml' extension, loading vars from only the first one found.
This commit is contained in:
C. Morgan Hamill 2013-04-15 09:26:34 -04:00 committed by Michael DeHaan
parent 454076590c
commit 863cb50530
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/ansible/inventory/vars_plugins/group_vars.py
View file

@ -44,7 +44,24 @@ class VarsModule(object):
# load vars in inventory_dir/group_vars/name_of_group # load vars in inventory_dir/group_vars/name_of_group
for x in groups: for x in groups:
path = os.path.join(basedir, "group_vars/%s" % x) p = os.path.join(basedir, "group_vars/%s" % x)
paths = [p, '.'.join([p, 'yml']), '.'.join([p, 'yaml'])]
for path in paths:
if os.path.exists(path):
data = utils.parse_yaml_from_file(path)
if type(data) != dict:
raise errors.AnsibleError("%s must be stored as a dictionary/hash" % path)
if C.DEFAULT_HASH_BEHAVIOUR == "merge":
# let data content override results if needed
results = utils.merge_hash(results, data)
else:
results.update(data)
break
# load vars in inventory_dir/hosts_vars/name_of_host
p = os.path.join(basedir, "host_vars/%s" % host.name)
paths = [p, '.'.join([p, 'yml']), '.'.join([p, 'yaml'])]
for path in paths:
if os.path.exists(path): if os.path.exists(path):
data = utils.parse_yaml_from_file(path) data = utils.parse_yaml_from_file(path)
if type(data) != dict: if type(data) != dict:
@ -54,17 +71,6 @@ class VarsModule(object):
results = utils.merge_hash(results, data) results = utils.merge_hash(results, data)
else: else:
results.update(data) results.update(data)
break
# load vars in inventory_dir/hosts_vars/name_of_host
path = os.path.join(basedir, "host_vars/%s" % host.name)
if os.path.exists(path):
data = utils.parse_yaml_from_file(path)
if type(data) != dict:
raise errors.AnsibleError("%s must be stored as a dictionary/hash" % path)
if C.DEFAULT_HASH_BEHAVIOUR == "merge":
# let data content override results if needed
results = utils.merge_hash(results, data)
else:
results.update(data)
return results return results