diff options
| author | Zhongyue Luo <zhongyue.nah@intel.com> | 2013-03-22 16:50:21 +0800 |
|---|---|---|
| committer | Zhongyue Luo <zhongyue.nah@intel.com> | 2013-03-22 17:02:54 +0800 |
| commit | 67628c56caf9d84588a92448880ecdb33eea08b4 (patch) | |
| tree | 5bab049aebe32ed00e4c73ce67216d20d9f5bdb2 /nova/virt/firewall.py | |
| parent | 127b32c00ca5e99439431d30d03775fd0e462f0a (diff) | |
| download | nova-67628c56caf9d84588a92448880ecdb33eea08b4.tar.gz | |
Fixes passing arbitrary conductor_api argument
Fixes bug #1158679
Change-Id: Iabe1f58b6139f5619e328a986143e8591b3a02cc
Diffstat (limited to 'nova/virt/firewall.py')
| -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 7e133135db..b61b57cfbb 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() |