From b2bfe3502b1bb73927d08ea0fcf964a508129267 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Wed, 26 Aug 2015 16:36:39 -0400 Subject: [PATCH 1/2] make sure delimiter is basestring for cvsfile fixes #12062 --- lib/ansible/plugins/lookup/csvfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/plugins/lookup/csvfile.py b/lib/ansible/plugins/lookup/csvfile.py index 478f063a120..9ef3e5dded1 100644 --- a/lib/ansible/plugins/lookup/csvfile.py +++ b/lib/ansible/plugins/lookup/csvfile.py @@ -30,7 +30,7 @@ class LookupModule(LookupBase): try: f = codecs.open(filename, 'r', encoding='utf-8') - creader = csv.reader(f, delimiter=delimiter) + creader = csv.reader(f, delimiter=str(delimiter)) for row in creader: if row[0] == key: @@ -70,7 +70,7 @@ class LookupModule(LookupBase): paramvals['delimiter'] = "\t" lookupfile = self._loader.path_dwim_relative(basedir, 'files', paramvals['file']) - var = self.read_csv(lookupfile, key, paramvals['delimiter'], paramvals['default'], paramvals['col']) + var = self.read_csv(lookupfile, key, str(paramvals['delimiter']), paramvals['default'], paramvals['col']) if var is not None: if type(var) is list: for v in var: From 5ba3452b7ee0e2abdf61d528e385057faff9e584 Mon Sep 17 00:00:00 2001 From: Chrrrles Paul Date: Wed, 26 Aug 2015 18:33:49 -0500 Subject: [PATCH 2/2] merged vmware_: vmkernel_ip_config, dvswitch, host, vmkernel, and dvs_portgroup --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3cb2e5fa17..d5221839ff4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -145,8 +145,13 @@ New Modules: * vmware: vmware_cluster * vmware: vmware_dns_config * vmware: vmware_dvs_host + * vmware: vmware_dvs_portgroup + * vmware: vmware_dvswitch + * vmware: vmware_host + * vmware: vmware_vmkernel_ip_config * vmware: vmware_portgroup * vmware: vmware_vm_facts + * vmware: vmware_vmkernel * vmware: vmware_vsan_cluster * vmware: vmware_vswitch * vmware: vca_fw