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

Modules is a package.

Browse source
This commit is contained in:
Michael DeHaan 2014-09-26 10:55:00 -04:00
parent 9249d1db28
commit 25cc79e2db
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
lib/ansible/modules/__init__.py Normal file
View file

9
lib/ansible/utils/plugins.py
View file

@ -101,7 +101,14 @@ class PluginLoader(object):
for basedir in _basedirs: for basedir in _basedirs:
fullpath = os.path.realpath(os.path.join(basedir, self.subdir)) fullpath = os.path.realpath(os.path.join(basedir, self.subdir))
if os.path.isdir(fullpath): if os.path.isdir(fullpath):
files = glob.glob("%s/*" % fullpath) files = glob.glob("%s/*" % fullpath)
# allow directories to be two levels deep
files2 = glob.glob("%s/*/*" % fullpath)
files = files.extend(files2)
for file in files: for file in files:
if os.path.isdir(file) and file not in ret: if os.path.isdir(file) and file not in ret:
ret.append(file) ret.append(file)
@ -232,7 +239,7 @@ shell_loader = PluginLoader(
module_finder = PluginLoader( module_finder = PluginLoader(
'', '',
'', 'ansible.modules',
C.DEFAULT_MODULE_PATH, C.DEFAULT_MODULE_PATH,
'library' 'library'
) )