cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #10298 from bcoca/lookup_wantlist

Browse source 
Allow requesting a list to lookup plugins instead of , delimited string
This commit is contained in:
Brian Coca 2015-02-20 10:16:57 -05:00
commit acbd096cf3
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docsite/rst/playbooks_lookups.rst
View file

@ -2,14 +2,16 @@ Using Lookups
============= =============
Lookup plugins allow access of data in Ansible from outside sources. These plugins are evaluated on the Ansible control Lookup plugins allow access of data in Ansible from outside sources. These plugins are evaluated on the Ansible control
machine, and can include reading the filesystem but also contacting external datastores and services. machine, and can include reading the filesystem but also contacting external datastores and services.
These values are then made available using the standard templating system These values are then made available using the standard templating system
in Ansible, and are typically used to load variables or templates with information from those systems. in Ansible, and are typically used to load variables or templates with information from those systems.
.. note:: This is considered an advanced feature, and many users will probably not rely on these features. .. note:: This is considered an advanced feature, and many users will probably not rely on these features.
.. note:: Lookups occur on the local computer, not on the remote computer. .. note:: Lookups occur on the local computer, not on the remote computer.
.. note:: Since 1.9 you can pass wantlist=True to lookups to use in jinja2 template "for" loops.
.. contents:: Topics .. contents:: Topics
.. _getting_file_contents: .. _getting_file_contents:

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

@ -89,6 +89,8 @@ def lookup(name, *args, **kwargs):
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))
tvars = kwargs.get('vars', None) tvars = kwargs.get('vars', None)
wantlist = kwargs.pop('wantlist', False)
if instance is not None: if instance is not None:
try: try:
ran = instance.run(*args, inject=tvars, **kwargs) ran = instance.run(*args, inject=tvars, **kwargs)
@ -98,7 +100,7 @@ def lookup(name, *args, **kwargs):
raise errors.AnsibleUndefinedVariable("One or more undefined variables: %s" % str(e)) raise errors.AnsibleUndefinedVariable("One or more undefined variables: %s" % str(e))
except Exception, e: except Exception, e:
raise errors.AnsibleError('Unexpected error in during lookup: %s' % e) raise errors.AnsibleError('Unexpected error in during lookup: %s' % e)
if ran: if ran and not wantlist:
ran = ",".join(ran) ran = ",".join(ran)
return ran return ran
else: else: