valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Lint fixes and comment out unrunnable code

Browse Source
This commit is contained in:
Thomas S Hatch 2014-04-08 15:47:20 -06:00
parent 864e9c4570
commit e3c1aa3e94
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/cloud/clouds/opennebula.py
View File

@ -60,7 +60,7 @@ def _xmltodict(xml):
while key in dicts:
key = key + str(idx)
idx += 1
if item.text == None:
if item.text is None:
dicts[key] = _xmltodict(item)
else:
dicts[key] = item.text
@ -184,7 +184,7 @@ def list_nodes(call=None):
)
vms[vm.find('NAME').text]['image'] = image
size = 'cpu {0}, memory {1}'.format(
vm.find('TEMPLATE').find('CPU').text,vm.find('TEMPLATE').find('MEMORY').text
vm.find('TEMPLATE').find('CPU').text, vm.find('TEMPLATE').find('MEMORY').text
)
vms[vm.find('NAME').text]['size'] = size
vms[vm.find('NAME').text]['state'] = vm.find('STATE').text
@ -218,7 +218,7 @@ def list_nodes_full(call=None):
)
vms[vm.find('NAME').text]['image'] = image
size = 'cpu {0}, memory {1}'.format(
vm.find('TEMPLATE').find('CPU').text,vm.find('TEMPLATE').find('MEMORY').text
vm.find('TEMPLATE').find('CPU').text, vm.find('TEMPLATE').find('MEMORY').text
)
vms[vm.find('NAME').text]['size'] = size
vms[vm.find('NAME').text]['state'] = vm.find('STATE').text
@ -303,8 +303,8 @@ def create(vm_):
ssh_key_name = config.get_cloud_config_value(
'ssh_key_name', vm_, __opts__, search_global=False
)
if ssh_key_name:
kwargs['ssh_key_ids'] = get_keyid(ssh_key_name)
#if ssh_key_name:
# kwargs['ssh_key_ids'] = get_keyid(ssh_key_name)
key_filename = config.get_cloud_config_value(
'ssh_key_file', vm_, __opts__, search_global=False, default=None
@ -329,7 +329,7 @@ def create(vm_):
)
region = ''
if kwargs['region_id'] != None:
if kwargs['region_id'] is not None:
region = 'SCHED_REQUIREMENTS="ID={0}"'.format(kwargs['region_id'])
try:
server, user, password = _get_xml_rpc()