Allow doing things like "groups.groupname" in with_nested.

Fixes #3858
pull/4420/head
Michael DeHaan 2013-10-07 16:57:45 -04:00
parent a2ac5d6df2
commit a7adc8ef4d
2 changed files with 4 additions and 10 deletions

View File

@ -45,12 +45,8 @@ class LookupModule(object):
def __lookup_injects(self, terms, inject): def __lookup_injects(self, terms, inject):
results = [] results = []
for x in terms: for x in terms:
if isinstance(x, basestring) and x in inject: intermediate = utils.listify_lookup_plugin_terms(x, self.basedir, inject)
results.append(inject[x]) results.append(intermediate)
elif isinstance(x, basestring):
raise errors.AnsibleError("cannot resolve: %s" % x)
else:
results.append(x)
return results return results
def run(self, terms, inject=None, **kwargs): def run(self, terms, inject=None, **kwargs):

View File

@ -45,10 +45,8 @@ class LookupModule(object):
def __lookup_injects(self, terms, inject): def __lookup_injects(self, terms, inject):
results = [] results = []
for x in terms: for x in terms:
if isinstance(x, basestring) and x in inject: intermediate = utils.listify_lookup_plugin_terms(x, self.basedir, inject)
results.append(inject[x]) results.append(intermediate)
else:
results.append(x)
return results return results
def run(self, terms, inject=None, **kwargs): def run(self, terms, inject=None, **kwargs):