Make more lookup plugins tolerant of new variable system, with a little better 'do what I mean' logic to resolving

what happens if you get a string back as a template result.
This commit is contained in:
Michael DeHaan
2013-04-16 19:07:19 -04:00
parent c0f8af5202
commit 86d47bce5f
11 changed files with 51 additions and 33 deletions

View File

@@ -66,10 +66,6 @@
# this will include the tasks in the file generic where it is found first (staging or production)
from ansible import utils, errors
import os
@@ -78,8 +74,12 @@ class LookupModule(object):
def __init__(self, basedir=None, **kwargs):
self.basedir = basedir
def run(self, terms, **kwargs):
def run(self, terms, inject=None, **kwargs):
terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject)
result = None
for term in terms:
if isinstance(term, dict):
files = term.get('files', [])