etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support mutiple management networks in systemvms (#4678) 

* Support mutliple management networks in systemvms

Currently only one management.network.cidr is suuported in systemvms
Allow supporting comma separated list of cidr's so that multiple
networks are reachable from systemvms.

* add local gateway

Co-authored-by: Rakesh Venkatesh <rakeshv@apache.org>
This commit is contained in:
Rakesh 2022-02-22 12:11:31 +01:00 committed by GitHub
parent 4e826d504e
commit 831f7cff54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
View File

@ -1254,8 +1254,11 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
if (nic.getTrafficType() == TrafficType.Management) { if (nic.getTrafficType() == TrafficType.Management) {
String mgmt_cidr = configurationDao.getValue(Config.ManagementNetwork.key()); String mgmt_cidr = configurationDao.getValue(Config.ManagementNetwork.key());
if (NetUtils.isValidIp4Cidr(mgmt_cidr)) { if (NetUtils.isValidCidrList(mgmt_cidr)) {
s_logger.debug("Management server cidr list is " + mgmt_cidr);
buf.append(" mgmtcidr=").append(mgmt_cidr); buf.append(" mgmtcidr=").append(mgmt_cidr);
} else {
s_logger.error("Invalid management cidr list: " + mgmt_cidr);
} }
buf.append(" localgw=").append(dest.getPod().getGateway()); buf.append(" localgw=").append(dest.getPod().getGateway());
} }

5
services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
View File

@ -1125,8 +1125,11 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar
} }
if (nic.getTrafficType() == TrafficType.Management) { if (nic.getTrafficType() == TrafficType.Management) {
String mgmt_cidr = _configDao.getValue(Config.ManagementNetwork.key()); String mgmt_cidr = _configDao.getValue(Config.ManagementNetwork.key());
if (NetUtils.isValidIp4Cidr(mgmt_cidr)) { if (NetUtils.isValidCidrList(mgmt_cidr)) {
s_logger.debug("Management server cidr list is " + mgmt_cidr);
buf.append(" mgmtcidr=").append(mgmt_cidr); buf.append(" mgmtcidr=").append(mgmt_cidr);
} else {
s_logger.error("Inavlid management server cidr list: " + mgmt_cidr);
} }
buf.append(" localgw=").append(dest.getPod().getGateway()); buf.append(" localgw=").append(dest.getPod().getGateway());
buf.append(" private.network.device=").append("eth").append(deviceId); buf.append(" private.network.device=").append("eth").append(deviceId);

7
systemvm/debian/opt/cloud/bin/setup/common.sh
View File

@ -322,7 +322,12 @@ setup_common() {
if [ -n "$MGMTNET" -a -n "$LOCAL_GW" ] if [ -n "$MGMTNET" -a -n "$LOCAL_GW" ]
then then
ip route add $MGMTNET via $LOCAL_GW dev eth1 log_it "Received mgmt cidr : $MGMTNET"
cidrs=(${MGMTNET//,/ })
for cidr in ${cidrs[@]}
do
ip route add $cidr via $LOCAL_GW dev eth1
done
fi fi
ip route delete default ip route delete default