From a6b827ca07d829f2346daaf596e6db1d8b45a6d4 Mon Sep 17 00:00:00 2001 From: Serge van Ginderachter Date: Sat, 11 May 2013 00:07:54 +0200 Subject: [PATCH] don't parse subdirs in host/group_vars as those are not supported in core vars_plugins/group_vars.py but might be used by other vars_plugins --- lib/ansible/inventory/vars_plugins/group_vars.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/inventory/vars_plugins/group_vars.py b/lib/ansible/inventory/vars_plugins/group_vars.py index d3864e400f8..d07c90ce581 100644 --- a/lib/ansible/inventory/vars_plugins/group_vars.py +++ b/lib/ansible/inventory/vars_plugins/group_vars.py @@ -47,7 +47,7 @@ class VarsModule(object): 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): + if os.path.exists(path) and not os.path.isdir(path): data = utils.parse_yaml_from_file(path) if type(data) != dict: raise errors.AnsibleError("%s must be stored as a dictionary/hash" % path) @@ -57,7 +57,7 @@ class VarsModule(object): 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) and not os.path.isdir(path): data = utils.parse_yaml_from_file(path) if type(data) != dict: raise errors.AnsibleError("%s must be stored as a dictionary/hash" % path)