Merge remote-tracking branch 'origin/4.14'

This commit is contained in:
Rohit Yadav 2020-12-08 14:02:29 +05:30
commit 6718be00d0

View File

@ -2692,8 +2692,10 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
if (_inSystemVM) { if (_inSystemVM) {
_localgw = (String)params.get("localgw"); _localgw = (String)params.get("localgw");
if (_localgw != null) { // can only happen inside service vm if (_localgw != null) { // can only happen inside service vm
String mgmtHost = (String)params.get("host"); String mgmtHosts = (String)params.get("host");
addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, mgmtHost); for (final String mgmtHost : mgmtHosts.split(",")) {
addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, mgmtHost);
}
String internalDns1 = (String)params.get("internaldns1"); String internalDns1 = (String)params.get("internaldns1");
if (internalDns1 == null) { if (internalDns1 == null) {