ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Lookup plugins in included files now look in paths relative to their files, allowing role usage.

Browse source
This commit is contained in:
Michael DeHaan 2013-06-01 18:15:38 -04:00
parent 7f0e89a2f6
commit b8a66ce5bb
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/ansible/runner/lookup_plugins/file.py
View file

@ -25,6 +25,7 @@ class LookupModule(object):
self.basedir = basedir self.basedir = basedir
def run(self, terms, inject=None, **kwargs): def run(self, terms, inject=None, **kwargs):
terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject) terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject)
ret = [] ret = []

7
lib/ansible/utils/template.py
View file

@ -81,6 +81,7 @@ def lookup(name, *args, **kwargs):
from ansible import utils from ansible import utils
instance = utils.plugins.lookup_loader.get(name.lower(), basedir=kwargs.get('basedir',None)) instance = utils.plugins.lookup_loader.get(name.lower(), basedir=kwargs.get('basedir',None))
vars = kwargs.get('vars', None) vars = kwargs.get('vars', None)
if instance is not None: if instance is not None:
ran = instance.run(*args, inject=vars, **kwargs) ran = instance.run(*args, inject=vars, **kwargs)
return ",".join(ran) return ",".join(ran)
@ -470,6 +471,12 @@ def template_from_string(basedir, data, vars):
environment.filters.update(_get_filters()) environment.filters.update(_get_filters())
environment.template_class = J2Template environment.template_class = J2Template
if '_original_file' in vars:
basedir = os.path.dirname(vars['_original_file'])
filesdir = os.path.join(basedir, '..', 'files')
if os.path.exists(filesdir):
basedir = filesdir
# TODO: may need some way of using lookup plugins here seeing we aren't calling # TODO: may need some way of using lookup plugins here seeing we aren't calling
# the legacy engine, lookup() as a function, perhaps? # the legacy engine, lookup() as a function, perhaps?