Merge "Avoid leaking security group quota reservations"

1 files changed, 6 insertions, 5 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 6ce5b5526..58044ed7f 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -2110,13 +2110,14 @@ class SecurityGroupAPI(base.Base):
 
         LOG.audit(_("Create Security Group %s"), name, context=context)
 
-        self.ensure_default(context)
+        try:
+            self.ensure_default(context)
 
-        if self.db.security_group_exists(context, context.project_id, name):
-            msg = _('Security group %s already exists') % name
-            self.raise_group_already_exists(msg)
+            if self.db.security_group_exists(context,
+                                             context.project_id, name):
+                msg = _('Security group %s already exists') % name
+                self.raise_group_already_exists(msg)
 
-        try:
             group = {'user_id': context.user_id,
                      'project_id': context.project_id,
                      'name': name,