Merge with trunk

1 files changed, 4 insertions, 4 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 5a73e6d2b..6037903c4 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -385,10 +385,6 @@ class API(base.Base):
         If you are changing this method, be sure to update both
         call paths.
         """
-        instance = dict(launch_index=num, **base_options)
-        instance = self.db.instance_create(context, instance)
-        instance_id = instance['id']
-
         elevated = context.elevated()
         if security_group is None:
             security_group = ['default']
@@ -402,6 +398,10 @@ class API(base.Base):
                     security_group_name)
             security_groups.append(group['id'])
 
+        instance = dict(launch_index=num, **base_options)
+        instance = self.db.instance_create(context, instance)
+        instance_id = instance['id']
+
         for security_group_id in security_groups:
             self.db.instance_add_security_group(elevated,
                                                 instance_id,