diff options
| author | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-02-18 17:07:57 +0100 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-02-18 17:07:57 +0100 |
| commit | 55e26db290860df6692dd8ef7595deb0d8478d5c (patch) | |
| tree | b8793fa3b30fc91fbe12aef26de7fae6ea9a76fc /v2 | |
| parent | Merge pull request #10275 from jensdepuydt/optimize-plugin-loader-10165 (diff) | |
| download | ansible-55e26db290860df6692dd8ef7595deb0d8478d5c.tar.xz ansible-55e26db290860df6692dd8ef7595deb0d8478d5c.zip | |
Support nested modules with ANSIBLE_LIBRARY env var
From v1: 4c2d06d2feec0648498426e798a6dcd61cce1fa1
Diffstat (limited to 'v2')
| -rw-r--r-- | v2/ansible/plugins/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/v2/ansible/plugins/__init__.py b/v2/ansible/plugins/__init__.py index 2125cff7b8..78586372c9 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) |