internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-06 10:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ansible/devel' into devel

Browse Source
This commit is contained in:
maty0609
2015-08-27 10:29:48 +01:00
parent 6f24e6f994 5ba3452b7e
commit 52e94468c9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -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

4
lib/ansible/plugins/lookup/csvfile.py
View File

@@ -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: