From 7c5087d17bce239c10f6827c26ecb7b149f3d908 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 1 Nov 2015 11:20:16 +0900 Subject: [PATCH] Don't wrap wrapped exception in create_server If we've wrapped the exception because of Auth things, we don't need to re-wrap it - it's just confusing. Change-Id: Ia1e45f4971f4b51f28538260d64f778aecaa6f3d --- shade/openstackcloud.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py index 3b9f2955c..18326d373 100644 --- a/shade/openstackcloud.py +++ b/shade/openstackcloud.py @@ -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)) @@ -828,6 +830,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 %s endpoint: %s" % (service_key, str(e))) @@ -3278,6 +3282,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))