diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2013-02-11 09:00:16 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2013-02-20 08:12:57 -0800 |
| commit | 1564bbce9816eaeeffb6007564cf5b1aaa7561a1 (patch) | |
| tree | 2262a2c05f3ed0559574eb5efafcd43663aa21a1 /nova/virt | |
| parent | 032308c7920b368541f1f89bfab550e1e9e48f31 (diff) | |
| download | nova-1564bbce9816eaeeffb6007564cf5b1aaa7561a1.tar.gz nova-1564bbce9816eaeeffb6007564cf5b1aaa7561a1.tar.xz nova-1564bbce9816eaeeffb6007564cf5b1aaa7561a1.zip | |
Fix handling of source_groups with no-db-compute.
The moving of data around in no-db-compute broke source groups. This
is a combination of a few errors. First, the instance_type data wasn't
being retrieved from system_metadata. Second, the instance_type data
was too deep in the heirarchy and being ignored. Finally, source
groups require a nw info call which causes a db access by
nova-compute.
Fixes bug 1122316
Change-Id: Iccb6e5d336c0b2c8ba41c41ab2e046fc9617835a
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/firewall.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py index 6ab4249b1..a36beb7f0 100644 --- a/nova/virt/firewall.py +++ b/nova/virt/firewall.py @@ -19,6 +19,7 @@ from oslo.config import cfg +from nova import conductor from nova import context from nova import network from nova.network import linux_net @@ -398,9 +399,11 @@ class IptablesFirewallDriver(FirewallDriver): # and should be the only one making # making rpc calls. nw_api = network.API() + capi = conductor.API() for instance in rule['grantee_group']['instances']: nw_info = nw_api.get_instance_nw_info(ctxt, - instance) + instance, + capi) ips = [ip['address'] for ip in nw_info.fixed_ips() |