[cloudstack] 05/09: 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 d70cfb279a2b6781a85ad49b898fe191fc41e086
Author: Wido den Hollander <w...@widodh.nl>
AuthorDate: Tue Jul 16 12:25:20 2019 +0200

    Send control.cidr parameter from Management Server to KVM Agent on connect
    
    Signed-off-by: Wido den Hollander <w...@widodh.nl>
---
 .../src/main/java/com/cloud/agent/manager/AgentManagerImpl.java         | 2 ++
 1 file changed, 2 insertions(+)

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 6091131..07d16bf 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,6 +38,7 @@ 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;
@@ -1750,6 +1751,7 @@ 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);