summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-15 22:52:28 +0000
committerGerrit Code Review <review@openstack.org>2012-11-15 22:52:28 +0000
commitca3501267c4c6d60a69ad6a7b87ca62a0a80e8e5 (patch)
tree9a714f0d6fe392a799155fc92af2001438f18456
parentf6e346580a4fa2e42d8e4ec3dadfef3a705e7ab5 (diff)
parent45402ff2ddf772e744bdb117d4c2edd4c74d8e7e (diff)
Merge "create_db_entry_for_new_instance did not call sgh for default"
-rw-r--r--nova/compute/api.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 5a8bcad2f..8c611f2fd 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -732,6 +732,10 @@ class API(base.Base):
self._populate_instance_shutdown_terminate(instance, image,
block_device_mapping)
+ # ensure_default security group is called before the instance
+ # is created so the creation of the default security group is
+ # proxied to the sgh.
+ self.security_group_api.ensure_default(context)
instance = self.db.instance_create(context, instance)
self._populate_instance_for_bdm(context, instance,