Merge pull request #9529 from sivel/env-nested-modules

Support nested modules with ANSIBLE_LIBRARY env var
10 years ago · 395952329a
parent ffc2e5a627 4c2d06d2fe
commit 395952329a
1 changed files with 1 additions and 1 deletions
--- a/lib/ansible/utils/plugins.py
+++ b/lib/ansible/utils/plugins.py
@ -127,7 +127,7 @@ class PluginLoader(object):
            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)