ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-28 03:00:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3684 from stoned/fix-3668

Browse source 
Add extra module path early during playbook parsing.
This commit is contained in:
Michael DeHaan 2013-08-01 17:14:35 -07:00
commit daf5ecc7c9
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/playbook/__init__.py
View file

@ -132,6 +132,9 @@ class PlayBook(object):
else: else:
self.inventory = inventory self.inventory = inventory
if self.module_path is not None:
utils.plugins.module_finder.add_directory(self.module_path)
self.basedir = os.path.dirname(playbook) or '.' self.basedir = os.path.dirname(playbook) or '.'
utils.plugins.push_basedir(self.basedir) utils.plugins.push_basedir(self.basedir)
vars = extra_vars.copy() vars = extra_vars.copy()

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

@ -132,7 +132,8 @@ class PluginLoader(object):
if directory is not None: if directory is not None:
if with_subdir: if with_subdir:
directory = os.path.join(directory, self.subdir) directory = os.path.join(directory, self.subdir)
self._extra_dirs.append(directory) if directory not in self._extra_dirs:
self._extra_dirs.append(directory)
def find_plugin(self, name): def find_plugin(self, name):
''' Find a plugin named name ''' ''' Find a plugin named name '''