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

Fixes #12774

Browse Source
This commit is contained in:
Daniel Wallace 2014-05-14 12:22:59 -05:00
parent ad40121e64
commit 1c2a2a719d
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/cloud/clouds/nova.py
View File

@ -488,16 +488,13 @@ def request_instance(vm_=None, call=None):
try:
data = conn.boot(**kwargs)
except Exception as exc:
log.error(
raise SaltCloudSystemExit(
'Error creating {0} on Nova\n\n'
'The following exception was thrown by libcloud when trying to '
'run the initial deployment: {1}\n'.format(
vm_['name'], exc
),
# Show the traceback if the debug logging level is enabled
exc_info=log.isEnabledFor(logging.DEBUG)
)
)
return False, vm_
vm_['password'] = data.extra.get('password', '')
return data, vm_

6
salt/cloud/clouds/openstack.py
View File

@ -545,14 +545,12 @@ def request_instance(vm_=None, call=None):
data = conn.create_node(**kwargs)
return data, vm_
except Exception as exc:
log.error(
raise SaltCloudSystemExit(
'Error creating {0} on OpenStack\n\n'
'The following exception was thrown by libcloud when trying to '
'run the initial deployment: {1}\n'.format(
vm_['name'], exc
),
# Show the traceback if the debug logging level is enabled
exc_info=log.isEnabledFor(logging.DEBUG)
)
)
return False, vm_