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

Merge pull request #9293 from cchurch/module_suffixes

Browse source 
Simpler fix for module suffixes than c02e8d8c8.
This commit is contained in:
Brian Coca 2015-02-26 23:33:51 -05:00
parent 5a64b2e269 8fb88be41b
commit 346689f9f2
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/runner/__init__.py
View file

@ -1347,7 +1347,7 @@ class Runner(object):
# Search module path(s) for named module. # Search module path(s) for named module.
module_suffixes = getattr(conn, 'default_suffixes', None) module_suffixes = getattr(conn, 'default_suffixes', None)
module_path = utils.plugins.module_finder.find_plugin(module_name, module_suffixes, transport=self.transport) module_path = utils.plugins.module_finder.find_plugin(module_name, module_suffixes)
if module_path is None: if module_path is None:
module_path2 = utils.plugins.module_finder.find_plugin('ping', module_suffixes) module_path2 = utils.plugins.module_finder.find_plugin('ping', module_suffixes)
if module_path2 is not None: if module_path2 is not None:

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

@ -156,15 +156,12 @@ class PluginLoader(object):
self._extra_dirs.append(directory) self._extra_dirs.append(directory)
self._paths = None self._paths = None
def find_plugin(self, name, suffixes=None, transport=''): def find_plugin(self, name, suffixes=None):
''' Find a plugin named name ''' ''' Find a plugin named name '''
if not suffixes: if not suffixes:
if self.class_name: if self.class_name:
suffixes = ['.py'] suffixes = ['.py']
else:
if transport == 'winrm':
suffixes = ['.ps1', '']
else: else:
suffixes = ['.py', ''] suffixes = ['.py', '']