Fixes passing arbitrary conductor_api argument

Fixes bug #1158679 Change-Id: Iabe1f58b6139f5619e328a986143e8591b3a02cc
2013-03-22 16:50:21 +08:00
parent 127b32c00c
commit 67628c56ca
1 changed files with 4 additions and 3 deletions
--- 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()