@@ -60,6 +60,7 @@ class PlayState:

         (rescue/always)

         '''

+        self._parent_iterator = parent_iterator

         self._run_state       = ITERATING_SETUP

         self._failed_state    = FAILED_NONE

         self._task_list       = parent_iterator._play.compile()

@@ -104,6 +105,8 @@ class PlayState:

                     if self._gather_facts == 'smart' and not self._host.gathered_facts or boolean(self._gather_facts):

                         self._host.set_gathered_facts(True)

                         task = Task()

+                        # FIXME: this is not the best way to get this...

+                        task.set_loader(self._parent_iterator._play._loader)

                         task.action = 'setup'

                         break

             elif run_state == ITERATING_TASKS:

@@ -97,9 +97,23 @@ class WorkerProcess(multiprocessing.Process):

             try:

                 if not self._main_q.empty():

                     debug("there's work to be done!")

-                    (host, task, job_vars, connection_info) = self._main_q.get(block=False)

+                    (host, task, basedir, job_vars, connection_info) = self._main_q.get(block=False)

                     debug("got a task/handler to work on: %s" % task)

+                    # because the task queue manager starts workers (forks) before the

+                    # playbook is loaded, set the basedir of the loader inherted by

+                    # this fork now so that we can find files correctly

+                    self._loader.set_basedir(basedir)

+

+                    # Serializing/deserializing tasks does not preserve the loader attribute,

+                    # since it is passed to the worker during the forking of the process and

+                    # would be wasteful to serialize. So we set it here on the task now, and

+                    # the task handles updating parent/child objects as needed.

+                    task.set_loader(self._loader)

+

+                    # apply the given task's information to the connection info,

+                    # which may override some fields already set by the play or

+                    # the options specified on the command line

                     new_connection_info = connection_info.set_task_override(task)

                     # execute the task and build a TaskResult from the result

@@ -58,7 +58,7 @@ class TaskExecutor:

         try:

             items = self._get_loop_items()

-            if items:

+            if items is not None:

                 if len(items) > 0:

                     item_results = self._run_loop(items)

                     res = dict(results=item_results)

@@ -84,7 +84,7 @@ class TaskExecutor:

         items = None

         if self._task.loop and self._task.loop in lookup_loader:

-            items = lookup_loader.get(self._task.loop).run(terms=self._task.loop_args, variables=self._job_vars)

+            items = lookup_loader.get(self._task.loop, loader=self._loader).run(terms=self._task.loop_args, variables=self._job_vars)

         return items

@@ -204,18 +204,3 @@ class DataLoader():

         self.set_basedir(cur_basedir)

         return source2 # which does not exist

-    #def __getstate__(self):

-    #    data = dict(

-    #        basedir = self._basedir,

-    #        vault_password = self._vault_password,

-    #        FILE_CACHE = self._FILE_CACHE,

-    #    )

-    #    return data

-

-    #def __setstate__(self, data):

-    #    self._basedir = data.get('basedir', '.')

-    #    self._FILE_CACHE = data.get('FILE_CACHE', dict())

-    #    self._vault_password = data.get('vault_password', '')

-    #

-    #    self._vault = VaultLib(password=self._vault_password)

-        

@@ -178,7 +178,7 @@ class Base:

         if self._loader is not None:

             basedir = self._loader.get_basedir()

-        templar = Templar(basedir=basedir, variables=all_vars, fail_on_undefined=fail_on_undefined)

+        templar = Templar(loader=self._loader, variables=all_vars, fail_on_undefined=fail_on_undefined)

         for (name, attribute) in iteritems(self._get_base_attributes()):

@@ -162,3 +162,10 @@ class Block(Base, Conditional, Taggable):

                 return False

         return super(Block, self).evaluate_tags(only_tags=only_tags, skip_tags=skip_tags)

+    def set_loader(self, loader):

+        self._loader = loader

+        if self._parent_block:

+            self._parent_block.set_loader(loader)

+        elif self._role:

+            self._role.set_loader(loader)

+

@@ -45,7 +45,7 @@ class Conditional:

         False if any of them evaluate as such.

         '''

-        templar = Templar(variables=all_vars)

+        templar = Templar(loader=self._loader, variables=all_vars)

         for conditional in self.when:

             if not self._check_conditional(conditional, templar):

                 return False

@@ -358,3 +358,10 @@ class Role(Base, Conditional, Taggable):

         super(Role, self).deserialize(data)

+    def set_loader(self, loader):

+        self._loader = loader

+        for parent in self._parents:

+            parent.set_loader(loader)

+        for dep in self.get_direct_dependencies():

+            dep.set_loader(loader)

+

@@ -200,7 +200,7 @@ class Task(Base, Conditional, Taggable):

         super(Task, self).post_validate(all_vars=all_vars, fail_on_undefined=fail_on_undefined)

     def _post_validate_loop_args(self, attr, value, all_vars, fail_on_undefined):

-        return listify_lookup_plugin_terms(value, all_vars)

+        return listify_lookup_plugin_terms(value, all_vars, loader=self._loader)

     def get_vars(self):

         return self.serialize()

@@ -283,3 +283,18 @@ class Task(Base, Conditional, Taggable):

                 return False

         return super(Task, self).evaluate_tags(only_tags=only_tags, skip_tags=skip_tags)

+

+    def set_loader(self, loader):

+        '''

+        Sets the loader on this object and recursively on parent, child objects.

+        This is used primarily after the Task has been serialized/deserialized, which

+        does not preserve the loader.

+        '''

+

+        self._loader = loader

+

+        if self._block:

+            self._block.set_loader(loader)

+

+        for dep in self._dep_chain:

+            dep.set_loader(loader)

@@ -33,7 +33,7 @@ class ActionModule(ActionBase):

                 result = dict(msg=self._task.args['msg'])

         # FIXME: move the LOOKUP_REGEX somewhere else

         elif 'var' in self._task.args: # and not utils.LOOKUP_REGEX.search(self._task.args['var']):

-            templar = Templar(variables=task_vars)

+            templar = Templar(loader=self._loader, variables=task_vars)

             results = templar.template(self._task.args['var'], convert_bare=True)

             result = dict()

             result[self._task.args['var']] = results

@@ -77,7 +77,7 @@ class ActionModule(ActionBase):

             dest = os.path.join(dest, base)

         # template the source data locally & get ready to transfer

-        templar = Templar(basedir=self._loader.get_basedir(), variables=task_vars)

+        templar = Templar(loader=self._loader, variables=task_vars)

         try:

             with open(source, 'r') as f:

                 template_data = f.read()

@@ -22,8 +22,8 @@ __metaclass__ = type

 __all__ = ['LookupBase']

 class LookupBase:

-    def __init__(self, **kwargs):

-        pass

+    def __init__(self, loader=None, **kwargs):

+        self._loader = loader

     def _flatten(self, terms):

         ret = []

@@ -41,3 +41,9 @@ class LookupBase:

                 results.append(self._flatten([x,y]))

         return results

+    def _flatten_hash_to_list(self, terms):

+        ret = []

+        for key in terms:

+            ret.append({'key': key, 'value': terms[key]})

+        return ret

+

new file mode 100644

@@ -0,0 +1,79 @@

+# (c) 2013, Jan-Piet Mens <jpmens(at)gmail.com>

+#

+# This file is part of Ansible

+#

+# Ansible is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# Ansible is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

+

+import os

+import codecs

+import csv

+

+from ansible.errors import *

+from ansible.plugins.lookup import LookupBase

+

+class LookupModule(LookupBase):

+

+    def read_csv(self, filename, key, delimiter, dflt=None, col=1):

+

+        try:

+            f = codecs.open(filename, 'r', encoding='utf-8')

+            creader = csv.reader(f, delimiter=delimiter)

+

+            for row in creader:

+                if row[0] == key:

+                    return row[int(col)]

+        except Exception, e:

+            raise AnsibleError("csvfile: %s" % str(e))

+

+        return dflt

+

+    def run(self, terms, variables=None, **kwargs):

+

+        if isinstance(terms, basestring):

+            terms = [ terms ]

+

+        ret = []

+        for term in terms:

+            params = term.split()

+            key = params[0]

+

+            paramvals = {

+                'file' : 'ansible.csv',

+                'default' : None,

+                'delimiter' : "TAB",

+                'col' : "1",          # column to return

+            }

+

+            # parameters specified?

+            try:

+                for param in params[1:]:

+                    name, value = param.split('=')

+                    assert(name in paramvals)

+                    paramvals[name] = value

+            except (ValueError, AssertionError), e:

+                raise AnsibleError(e)

+

+            if paramvals['delimiter'] == 'TAB':

+                paramvals['delimiter'] = "\t"

+

+            path = self._loader.path_dwim(paramvals['file'])

+

+            var = self.read_csv(path, key, paramvals['delimiter'], paramvals['default'], paramvals['col'])

+            if var is not None:

+                if type(var) is list:

+                    for v in var:

+                        ret.append(v)

+                else:

+                    ret.append(var)

+        return ret

new file mode 100644

@@ -0,0 +1,27 @@

+# (c) 2014, Kent R. Spillner <kspillner@acm.org>

+#

+# This file is part of Ansible

+#

+# Ansible is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# Ansible is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

+

+from ansible.plugins.lookup import LookupBase

+

+class LookupModule(LookupBase):

+

+    def run(self, terms, varibles=None, **kwargs):

+

+        if not isinstance(terms, dict):

+            raise errors.AnsibleError("with_dict expects a dict")

+

+        return self._flatten_hash_to_list(terms)

new file mode 100644

@@ -0,0 +1,68 @@

+# (c) 2012, Jan-Piet Mens <jpmens(at)gmail.com>

+#

+# This file is part of Ansible

+#

+# Ansible is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# Ansible is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

+

+import os

+

+HAVE_DNS=False

+try:

+    import dns.resolver

+    from dns.exception import DNSException

+    HAVE_DNS=True

+except ImportError:

+    pass

+

+from ansible.errors import *

+from ansible.plugins.lookup import LookupBase

+

+# ==============================================================

+# DNSTXT: DNS TXT records

+#

+#       key=domainname

+# TODO: configurable resolver IPs

+# --------------------------------------------------------------

+

+class LookupModule(LookupBase):

+

+    def run(self, terms, variables=None, **kwargs):

+

+        if HAVE_DNS == False:

+            raise AnsibleError("Can't LOOKUP(dnstxt): module dns.resolver is not installed")

+

+        if isinstance(terms, basestring):

+            terms = [ terms ]

+

+        ret = []

+        for term in terms:

+            domain = term.split()[0]

+            string = []

+            try:

+                answers = dns.resolver.query(domain, 'TXT')

+                for rdata in answers:

+                    s = rdata.to_text()

+                    string.append(s[1:-1])  # Strip outside quotes on TXT rdata

+

+            except dns.resolver.NXDOMAIN:

+                string = 'NXDOMAIN'

+            except dns.resolver.Timeout:

+                string = ''

+            except dns.exception.DNSException, e:

+                raise AnsibleError("dns.resolver unhandled exception", e)

+

+            ret.append(''.join(string))

+

+        return ret

+

new file mode 100644

@@ -0,0 +1,34 @@

+# (c) 2012, Jan-Piet Mens <jpmens(at)gmail.com>

+#

+# This file is part of Ansible

+#

+# Ansible is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# Ansible is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

+

+import os

+

+from ansible.plugins.lookup import LookupBase

+

+class LookupModule(LookupBase):

+

+    def run(self, terms, variables, **kwargs):

+

+        if isinstance(terms, basestring):

+            terms = [ terms ]

+

+        ret = []

+        for term in terms:

+            var = term.split()[0]

+            ret.append(os.getenv(var, ''))

+

+        return ret

new file mode 100644

@@ -0,0 +1,75 @@

+# (c) 2013, Jan-Piet Mens <jpmens(at)gmail.com>

+#

+# This file is part of Ansible

+#

+# Ansible is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# Ansible is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

+

+import os

+import urllib2

+try:

+    import json

+except ImportError:

+    import simplejson as json

+

+from ansible.plugins.lookup import LookupBase

+

+# this can be made configurable, not should not use ansible.cfg

+ANSIBLE_ETCD_URL = 'http://127.0.0.1:4001'

+if os.getenv('ANSIBLE_ETCD_URL') is not None:

+    ANSIBLE_ETCD_URL = os.environ['ANSIBLE_ETCD_URL']

+

+class etcd():

+    def __init__(self, url=ANSIBLE_ETCD_URL):

+        self.url = url

+        self.baseurl = '%s/v1/keys' % (self.url)

+

+    def get(self, key):

+        url = "%s/%s" % (self.baseurl, key)

+

+        data = None

+        value = ""

+        try:

+            r = urllib2.urlopen(url)

+            data = r.read()

+        except:

+            return value

+

+        try:

+            # {"action":"get","key":"/name","value":"Jane Jolie","index":5}

+            item = json.loads(data)

+            if 'value' in item:

+                value = item['value']

+            if 'errorCode' in item:

+                value = "ENOENT"

+        except:

+            raise

+            pass

+

+        return value

+

+class LookupModule(LookupBase):

+

+    def run(self, terms, variables, **kwargs):

+

+        if isinstance(terms, basestring):

+            terms = [ terms ]

+

+        etcd = etcd()

+

+        ret = []

+        for term in terms:

+            key = term.split()[0]

+            value = etcd.get(key)

+            ret.append(value)

+        return ret

new file mode 100644

@@ -0,0 +1,58 @@

+# (c) 2012, Daniel Hokka Zakrisson <daniel@hozac.com>

+#

+# This file is part of Ansible

+#

+# Ansible is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# Ansible is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

+

+import os

+import codecs

+

+from ansible.errors import *

+from ansible.plugins.lookup import LookupBase

+

+class LookupModule(LookupBase):

+

+    def run(self, terms, variables=None, **kwargs):

+

+        if not isinstance(terms, list):

+            terms = [ terms ]

+

+        ret = []

+        for term in terms:

+            basedir_path  = self._loader.path_dwim(term)

+            relative_path = None

+            playbook_path = None

+

+            # Special handling of the file lookup, used primarily when the

+            # lookup is done from a role. If the file isn't found in the

+            # basedir of the current file, use dwim_relative to look in the

+            # role/files/ directory, and finally the playbook directory

+            # itself (which will be relative to the current working dir)

+

+            # FIXME: the original file stuff still needs to be worked out, but the

+            #        playbook_dir stuff should be able to be removed as it should

+            #        be covered by the fact that the loader contains that info

+            #if '_original_file' in variables:

+            #    relative_path = self._loader.path_dwim_relative(variables['_original_file'], 'files', term, self.basedir, check=False)

+            #if 'playbook_dir' in variables:

+            #    playbook_path = os.path.join(variables['playbook_dir'], term)

+

+            for path in (basedir_path, relative_path, playbook_path):

+                if path and os.path.exists(path):

+                    ret.append(codecs.open(path, encoding="utf8").read().rstrip())

+                    break

+            else:

+                raise AnsibleError("could not locate file in lookup: %s" % term)

+

+        return ret

new file mode 100644

@@ -0,0 +1,32 @@

+# (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>

+#

+# This file is part of Ansible

+#

+# Ansible is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# Ansible is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

+

+import os

+import glob

+

+from ansible.plugins.lookup import LookupBase

+

+class LookupModule(LookupBase):

+

+    def run(self, terms, variables=None, **kwargs):

+

+        ret = []

+        for term in terms:

+            dwimmed = self._loader.path_dwim(term)

+            globbed = glob.glob(dwimmed)

+            ret.extend(g for g in globbed if os.path.isfile(g))

+        return ret

new file mode 100644

@@ -0,0 +1,191 @@

+# (c) 2013, seth vidal <skvidal@fedoraproject.org> red hat, inc

+#

+# This file is part of Ansible

+#

+# Ansible is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# Ansible is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

+

+# take a list of files and (optionally) a list of paths

+# return the first existing file found in the paths

+# [file1, file2, file3], [path1, path2, path3]

+# search order is:

+# path1/file1

+# path1/file2

+# path1/file3

+# path2/file1

+# path2/file2

+# path2/file3

+# path3/file1

+# path3/file2

+# path3/file3

+

+# first file found with os.path.exists() is returned

+# no file matches raises ansibleerror

+# EXAMPLES

+#  - name: copy first existing file found to /some/file

+#    action: copy src=$item dest=/some/file

+#    with_first_found: 

+#     - files: foo ${inventory_hostname} bar

+#       paths: /tmp/production /tmp/staging

+

+# that will look for files in this order:

+# /tmp/production/foo

+#                 ${inventory_hostname}

+#                 bar

+# /tmp/staging/foo

+#              ${inventory_hostname}

+#              bar

+                  

+#  - name: copy first existing file found to /some/file

+#    action: copy src=$item dest=/some/file

+#    with_first_found: 

+#     - files: /some/place/foo ${inventory_hostname} /some/place/else

+

+#  that will look for files in this order:

+#  /some/place/foo

+#  $relative_path/${inventory_hostname}

+#  /some/place/else

+

+# example - including tasks:

+#  tasks:

+#  - include: $item

+#    with_first_found:

+#     - files: generic

+#       paths: tasks/staging tasks/production

+# this will include the tasks in the file generic where it is found first (staging or production)

+

+# example simple file lists

+#tasks:

+#- name: first found file

+#  action: copy src=$item dest=/etc/file.cfg

+#  with_first_found:

+#  - files: foo.${inventory_hostname} foo

+

+

+# example skipping if no matched files

+# First_found also offers the ability to control whether or not failing

+# to find a file returns an error or not

+#

+#- name: first found file - or skip

+#  action: copy src=$item dest=/etc/file.cfg

+#  with_first_found:

+#  - files: foo.${inventory_hostname}

+#    skip: true

+

+# example a role with default configuration and configuration per host

+# you can set multiple terms with their own files and paths to look through.

+# consider a role that sets some configuration per host falling back on a default config.

+#

+#- name: some configuration template

+#  template: src={{ item }} dest=/etc/file.cfg mode=0444 owner=root group=root

+#  with_first_found:

+#   - files:

+#      - ${inventory_hostname}/etc/file.cfg

+#     paths:

+#      - ../../../templates.overwrites

+#      - ../../../templates

+#   - files:

+#      - etc/file.cfg

+#     paths:

+#      - templates

+

+# the above will return an empty list if the files cannot be found at all

+# if skip is unspecificed or if it is set to false then it will return a list 

+# error which can be caught bye ignore_errors: true for that action.

+

+# finally - if you want you can use it, in place to replace first_available_file:

+# you simply cannot use the - files, path or skip options. simply replace

+# first_available_file with with_first_found and leave the file listing in place

+#

+#

+#  - name: with_first_found like first_available_file

+#    action: copy src=$item dest=/tmp/faftest

+#    with_first_found:

+#     - ../files/foo

+#     - ../files/bar

+#     - ../files/baz

+#    ignore_errors: true

+

+

+import os

+

+from ansible.plugins.lookup import LookupBase

+

+class LookupModule(LookupBase):

+

+    def run(self, terms, variables, **kwargs):

+

+        result = None

+        anydict = False

+        skip = False

+

+        for term in terms:

+            if isinstance(term, dict):

+                anydict = True

+

+        total_search = []

+        if anydict:

+            for term in terms:

+                if isinstance(term, dict):

+                    files = term.get('files', [])

+                    paths = term.get('paths', [])

+                    skip  = boolean(term.get('skip', False))

+

+                    filelist = files

+                    if isinstance(files, basestring):

+                        files = files.replace(',', ' ')

+                        files = files.replace(';', ' ')

+                        filelist = files.split(' ')

+

+                    pathlist = paths

+                    if paths:

+                        if isinstance(paths, basestring):

+                            paths = paths.replace(',', ' ')

+                            paths = paths.replace(':', ' ')

+                            paths = paths.replace(';', ' ')

+                            pathlist = paths.split(' ')

+

+                    if not pathlist:

+                        total_search = filelist

+                    else:

+                        for path in pathlist:

+                            for fn in filelist:

+                                f = os.path.join(path, fn)

+                                total_search.append(f)

+                else:

+                    total_search.append(term)

+        else:

+            total_search = terms

+

+        for fn in total_search:

+            # FIXME: the original file stuff needs to be fixed/implemented

+            #if variables and '_original_file' in variables:

+            #    # check the templates and vars directories too,

+            #    # if they exist

+            #    for roledir in ('templates', 'vars'):

+            #        path = self._loader.path_dwim(os.path.join(self.basedir, '..', roledir), fn)

+            #        if os.path.exists(path):

+            #            return [path]

+

+            # if none of the above were found, just check the

+            # current filename against the basedir (this will already

+            # have ../files from runner, if it's a role task

+            path = self._loader.path_dwim(fn)

+            if os.path.exists(path):

+                return [path]

+        else:

+            if skip:

+                return []

+            else:

+                return [None]

+

new file mode 100644

@@ -0,0 +1,69 @@

+# (c) 2013, Serge van Ginderachter <serge@vanginderachter.be>

+#

+# This file is part of Ansible

+#

+# Ansible is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# Ansible is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

+

+

+from ansible.errors import *

+from ansible.plugins.lookup import LookupBase

+from ansible.utils.listify import listify_lookup_plugin_terms

+

+class LookupModule(LookupBase):

+

+    def _check_list_of_one_list(self, term):

+        # make sure term is not a list of one (list of one..) item

+        # return the final non list item if so

+

+        if isinstance(term,list) and len(term) == 1:

+            term = term[0]

+            if isinstance(term,list):

+                term = self._check_list_of_one_list(term)

+

+        return term

+

+    def _do_flatten(self, terms, variables):

+

+        ret = []

+        for term in terms:

+            term = self._check_list_of_one_list(term)

+

+            if term == 'None' or term == 'null':

+                # ignore undefined items

+                break

+

+            if isinstance(term, basestring):

+                # convert a variable to a list

+                term2 = listify_lookup_plugin_terms(term, variables, loader=self._loader)

+                # but avoid converting a plain string to a list of one string

+                if term2 != [ term ]:

+                    term = term2

+

+            if isinstance(term, list):

+                # if it's a list, check recursively for items that are a list

+                term = self._do_flatten(term, variables)

+                ret.extend(term)

+            else:

+                ret.append(term)

+

+        return ret

+

+

+    def run(self, terms, variables, **kwargs):

+

+        if not isinstance(terms, list):

+            raise AnsibleError("with_flattened expects a list")

+

+        return self._do_flatten(terms, variables)

+

new file mode 100644