From 67628c56caf9d84588a92448880ecdb33eea08b4 Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Fri, 22 Mar 2013 16:50:21 +0800 Subject: Fixes passing arbitrary conductor_api argument Fixes bug #1158679 Change-Id: Iabe1f58b6139f5619e328a986143e8591b3a02cc --- nova/virt/firewall.py | 7 ++++--- 1 file 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() -- cgit