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

pull/12122/head
maty0609 9 years ago
commit 52e94468c9

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

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

Loading…
Cancel
Save