From 8737061a8f45207bfd4f0c9c8eb9514ca583603a Mon Sep 17 00:00:00 2001 From: Abhijit Menon-Sen Date: Sat, 25 Jul 2015 15:38:26 +0530 Subject: [PATCH 1/2] lookupfile should lookup the given file=xxx (Earlier it used to lookup the pre-split term.) --- lib/ansible/plugins/lookup/csvfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/plugins/lookup/csvfile.py b/lib/ansible/plugins/lookup/csvfile.py index e15fd3fc36f..5052342e8a4 100644 --- a/lib/ansible/plugins/lookup/csvfile.py +++ b/lib/ansible/plugins/lookup/csvfile.py @@ -75,7 +75,7 @@ class LookupModule(LookupBase): if paramvals['delimiter'] == 'TAB': paramvals['delimiter'] = "\t" - lookupfile = self._loader.path_dwim_relative(basedir, 'files', term) + lookupfile = self._loader.path_dwim_relative(basedir, 'files', paramvals['file']) var = self.read_csv(lookupfile, key, paramvals['delimiter'], paramvals['default'], paramvals['col']) if var is not None: if type(var) is list: From 8156ad3760c988d44abcd028797721c80b29a33c Mon Sep 17 00:00:00 2001 From: JustInVTime Date: Thu, 7 May 2015 18:37:28 +0200 Subject: [PATCH 2/2] Delimiter param must be a string --- v1/ansible/runner/lookup_plugins/csvfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/v1/ansible/runner/lookup_plugins/csvfile.py b/v1/ansible/runner/lookup_plugins/csvfile.py index ce5a2b77d2f..a9ea8ed90cd 100644 --- a/v1/ansible/runner/lookup_plugins/csvfile.py +++ b/v1/ansible/runner/lookup_plugins/csvfile.py @@ -63,7 +63,10 @@ class LookupModule(object): for param in params[1:]: name, value = param.split('=') assert(name in paramvals) - paramvals[name] = value + if name == 'delimiter': + paramvals[name] = str(value) + else: + paramvals[name] = value except (ValueError, AssertionError), e: raise errors.AnsibleError(e)