From 55e26db290860df6692dd8ef7595deb0d8478d5c Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Wed, 18 Feb 2015 08:07:57 -0800 Subject: [PATCH] Support nested modules with ANSIBLE_LIBRARY env var From v1: 4c2d06d2feec0648498426e798a6dcd61cce1fa1 --- v2/ansible/plugins/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2/ansible/plugins/__init__.py b/v2/ansible/plugins/__init__.py index 2125cff7b8b..78586372c91 100644 --- a/v2/ansible/plugins/__init__.py +++ b/v2/ansible/plugins/__init__.py @@ -131,7 +131,7 @@ class PluginLoader: configured_paths = self.config.split(os.pathsep) for path in configured_paths: path = os.path.realpath(os.path.expanduser(path)) - contents = glob.glob("%s/*" % path) + contents = glob.glob("%s/*" % path) + glob.glob("%s/*/*" % path) for c in contents: if os.path.isdir(c) and c not in ret: ret.append(c)