internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-02 16:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

vars_loader should get the path to the inventory + vars_plugins

Browse Source
This commit is contained in:
Daniel Hokka Zakrisson
2013-03-01 23:22:07 +01:00
parent ad08995989
commit f1eb195ff5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/inventory/__init__.py
View File

@@ -92,7 +92,7 @@ class Inventory(object):
else:
raise errors.AnsibleError("YAML inventory support is deprecated in 0.6 and removed in 0.7, see the migration script in examples/scripts in the git checkout")
utils.plugins.vars_loader.add_directory(self.basedir())
utils.plugins.vars_loader.add_directory(self.basedir(), with_subdir=True)
else:
raise errors.AnsibleError("Unable to find an inventory file, specify one with -i ?")

4
lib/ansible/utils/plugins.py
View File

@@ -68,9 +68,11 @@ class PluginLoader(object):
ret += self._get_package_path()
return ret
def add_directory(self, directory):
def add_directory(self, directory, with_subdir=False):
"""Adds an additional directory to the search path"""
if directory is not None:
if with_subdir:
directory = os.path.join(directory, self.subdir)
self._extra_dirs.append(directory)
def print_paths(self):