openstack/shade
Code Issues Proposed changes

Merge "Don't wrap wrapped exception in create_server"

Browse Source
This commit is contained in:
Jenkins 2015-11-04 13:39:52 +00:00 committed by Gerrit Code Review
commit 9e04c76728
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shade/openstackcloud.py
View File

@ -302,6 +302,8 @@ class OpenStackCloud(object):
verify=self.verify,
cert=self.cert,
timeout=self.api_timeout)
except OpenStackCloudException:
raise
except Exception as e:
raise OpenStackCloudException(
"Error authenticating to keystone: %s " % str(e))
@ -826,6 +828,8 @@ class OpenStackCloud(object):
self.log.debug(
"Endpoint not found in %s cloud: %s", self.name, str(e))
endpoint = None
except OpenStackCloudException:
raise
except Exception as e:
raise OpenStackCloudException(
"Error getting {service} endpoint on {cloud}:{region}:"
@ -3243,6 +3247,8 @@ class OpenStackCloud(object):
# new server
server = self.get_server_by_id(server.id)
server_id = server['id']
except OpenStackCloudException:
raise
except Exception as e:
raise OpenStackCloudException(
"Error in creating instance: {0}".format(e))