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

Merge pull request #2481 from stoned/misc-comments-fix

Browse source 
Fix pathnames in comments
This commit is contained in:
Michael DeHaan 2013-03-21 21:10:42 -07:00
commit 50461a686c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@ class VarsModule(object):
results = {}
# load vars in playbook_dir/group_vars/name_of_group
# load vars in inventory_dir/group_vars/name_of_group
for x in groups:
path = os.path.join(basedir, "group_vars/%s" % x)
if os.path.exists(path):
@ -55,7 +55,7 @@ class VarsModule(object):
else:
results.update(data)
# load vars in playbook_dir/group_vars/name_of_host
# 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)