Skip to content

A
ansible
Commit a7adc8ef by Michael DeHaan
Options

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

Fixes #3858
parent a2ac5d6d
Showing with 4 additions and 10 deletions
lib/ansible/runner/lookup_plugins/nested.py
...@@ -45,12 +45,8 @@ class LookupModule(object): ...@@ -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):
......
lib/ansible/runner/lookup_plugins/together.py
...@@ -45,10 +45,8 @@ class LookupModule(object): ...@@ -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):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment