Skip to content

Support mutiple management networks in systemvms #4678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvazquez merged 2 commits into from
Feb 22, 2022
Merged

Support mutiple management networks in systemvms #4678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66801d9
Support mutliple management networks in systemvms
ravening Feb 10, 2021
b03498e
add local gateway
Sep 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,8 +1251,11 @@ public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, Depl

if (nic.getTrafficType() == TrafficType.Management) {
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);
} else {
s_logger.error("Invalid management cidr list: " + mgmt_cidr);
}
buf.append(" localgw=").append(dest.getPod().getGateway());
}
Expand Down
5 changes: 4 additions & 1 deletion ...ler/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,8 +1125,11 @@ public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, Depl
}
if (nic.getTrafficType() == TrafficType.Management) {
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);
} else {
s_logger.error("Inavlid management server cidr list: " + mgmt_cidr);
}
buf.append(" localgw=").append(dest.getPod().getGateway());
buf.append(" private.network.device=").append("eth").append(deviceId);
Expand Down
7 changes: 6 additions & 1 deletion systemvm/debian/opt/cloud/bin/setup/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,12 @@ setup_common() {

if [ -n "$MGMTNET" -a -n "$LOCAL_GW" ]
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

ip route delete default
Expand Down