[cloudstack] 07/09: Revert "Send control.cidr parameter from Management Server to KVM Agent on connect"

[gabriel]

This is an automated email from the ASF dual-hosted git repository.

gabriel pushed a commit to branch cloud0-cidr-412
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 2d7af0cc90d6a478e80fedc7dcb1c51a8cfa0572
Author: Wido den Hollander <w...@widodh.nl>
AuthorDate: Tue Jul 16 13:34:21 2019 +0200

    Revert "Send control.cidr parameter from Management Server to KVM Agent on 
connect"
    
    This reverts commit 1caa791aa7cd8c2849bcd74ed03f34ab95f74826.
---
 .../src/main/java/com/cloud/agent/manager/AgentManagerImpl.java         | 2 --
 1 file changed, 2 deletions(-)

diff --git 
a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
 
b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
index 07d16bf..6091131 100644
--- 
a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
+++ 
b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
@@ -38,7 +38,6 @@ import java.util.concurrent.locks.ReentrantLock;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.configuration.Config;
 import org.apache.cloudstack.agent.lb.IndirectAgentLB;
 import org.apache.cloudstack.ca.CAManager;
 import org.apache.cloudstack.framework.config.ConfigKey;
@@ -1751,7 +1750,6 @@ public class AgentManagerImpl extends ManagerBase 
implements AgentManager, Handl
                 if (((StartupRoutingCommand)cmd).getHypervisorType() == 
HypervisorType.KVM || ((StartupRoutingCommand)cmd).getHypervisorType() == 
HypervisorType.LXC) {
                     Map<String, String> params = new HashMap<String, String>();
                     params.put("router.aggregation.command.each.timeout", 
_configDao.getValue("router.aggregation.command.each.timeout"));
-                    params.put(Config.ControlCidr.key(), 
_configDao.getValue(Config.ControlCidr.key()));
 
                     try {
                         SetHostParamsCommand cmds = new 
SetHostParamsCommand(params);