diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-22 16:00:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-22 16:00:06 +0000 |
| commit | 86396da1addad7700bab15fb16e8e644f4f833e9 (patch) | |
| tree | a30baec1d04a5815422f019ef6d208ed3d984b77 | |
| parent | c21016c26749f4efb0978d5e4fea9560fc4d0603 (diff) | |
| parent | 67628c56caf9d84588a92448880ecdb33eea08b4 (diff) | |
| download | nova-86396da1addad7700bab15fb16e8e644f4f833e9.tar.gz nova-86396da1addad7700bab15fb16e8e644f4f833e9.tar.xz nova-86396da1addad7700bab15fb16e8e644f4f833e9.zip | |
Merge "Fixes passing arbitrary conductor_api argument"
| -rw-r--r-- | nova/virt/firewall.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py index 7e133135d..b61b57cfb 100644 --- a/nova/virt/firewall.py +++ b/nova/virt/firewall.py @@ -417,9 +417,10 @@ class IptablesFirewallDriver(FirewallDriver): nw_api = network.API() capi = conductor.API() for instance in rule['grantee_group']['instances']: - nw_info = nw_api.get_instance_nw_info(ctxt, - instance, - capi) + nw_info = nw_api.get_instance_nw_info( + ctxt, + instance, + conductor_api=capi) ips = [ip['address'] for ip in nw_info.fixed_ips() |