From 667a1d18a4a1d88e9d2c7d6585f5c25ebf032575 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Thu, 21 Feb 2013 14:42:42 -0800 Subject: [PATCH] CLOUDSTACK-1288: Fix regression on remove LB rules It's a regression caused by: commit 69d24545c4f0e316dba534b6d5d99308795db6d4 Author: Murali Reddy Date: Fri Feb 8 18:50:18 2013 +0530 CLOUDSTACK-1208: Failed to shutdown guest network Firewall manager was being used instead of LoadBalancingRules manager while applying the load balancer rules in shut down network. Changing it to LoadBalancingRules manager. The parameter transferre to applyRules() should be lbRules, rather than the lbs object. --- server/src/com/cloud/network/NetworkManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index f5868658751..2e19fa11d09 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -3070,7 +3070,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L } try { - if (!_lbMgr.applyRules(network, Purpose.LoadBalancing, lbs)) { + if (!_lbMgr.applyRules(network, Purpose.LoadBalancing, lbRules)) { s_logger.warn("Failed to cleanup lb rules as a part of shutdownNetworkRules"); success = false; }