summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Rosen <arosen@nicira.com>2013-03-04 15:09:09 -0800
committerAaron Rosen <arosen@nicira.com>2013-03-04 15:19:31 -0800
commit130b7663a6f3434330d27ecbafcf4f480bf77cfb (patch)
tree288568257a75ce31754da6c8f9be035fe397da6b
parenta246cb90d229aea5cf70d886ad76061d5ad59010 (diff)
downloadnova-130b7663a6f3434330d27ecbafcf4f480bf77cfb.tar.gz
nova-130b7663a6f3434330d27ecbafcf4f480bf77cfb.tar.xz
nova-130b7663a6f3434330d27ecbafcf4f480bf77cfb.zip
quantum security_group driver queries db regression
The following commit 1c6cc18 removed the populate_security_groups() method in nova/compute/api.py which causes nova-api to check against the database if a security group exists. Fixes bug 1145426 Change-Id: I35a6003ac4c16df364302cf90f701ed977f54946
-rw-r--r--nova/compute/api.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index bd2bafe33..69a8362df 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -872,8 +872,8 @@ class API(base.Base):
base_image_ref = base_options['image_ref']
instance['system_metadata']['image_base_image_ref'] = base_image_ref
- instance['security_groups'] = security_groups
-
+ self.security_group_api.populate_security_groups(instance,
+ security_groups)
return instance
#NOTE(bcwaldon): No policy check since this is only used by scheduler and
@@ -3151,3 +3151,6 @@ class SecurityGroupAPI(base.Base, security_group_base.SecurityGroupBase):
groups = instance.get('security_groups')
if groups:
return [{'name': group['name']} for group in groups]
+
+ def populate_security_groups(self, instance, security_groups):
+ instance['security_groups'] = security_groups