diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-05 01:30:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-05 01:30:40 +0000 |
| commit | c7684046feaaeceedb05d5267d65157086a9761e (patch) | |
| tree | 4216ad8dacaad2f2a2bde052ae1a36c6dd629695 | |
| parent | e2d956ccaab96c7035fdda2c825ecc1e7bb5423a (diff) | |
| parent | 130b7663a6f3434330d27ecbafcf4f480bf77cfb (diff) | |
| download | nova-c7684046feaaeceedb05d5267d65157086a9761e.tar.gz nova-c7684046feaaeceedb05d5267d65157086a9761e.tar.xz nova-c7684046feaaeceedb05d5267d65157086a9761e.zip | |
Merge "quantum security_group driver queries db regression"
| -rw-r--r-- | nova/compute/api.py | 7 |
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 |