apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 14189 - multiple physical nw - SSVM fail to download guest templates from storage server which is in isolated network only accessible by host's bridge

Browse Source 
if storage network is present, don't set route through private ip when adding internal download site

status 14189: resovled fixed
This commit is contained in:
frank 2012-03-16 14:48:03 -07:00
parent 8071f51678
commit a6a54a2f87
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
View File

@ -797,7 +797,12 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
s_logger.warn("Error in allowing outgoing to " + destCidr + ", err=" + result );
return "Error in allowing outgoing to " + destCidr + ", err=" + result;
}
addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, destCidr);
if (_storageIp == null) {
/* only set route when no storage network present */
addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, destCidr);
}
return null;
}

3
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
View File

@ -374,9 +374,6 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V
}
}
List<? extends Nic> nics = _networkMgr.getNicsForTraffic(secStorageVm.getId(), TrafficType.Management);
Nic privateNic = nics.get(0);
String privateCidr = NetUtils.ipAndNetMaskToCidr(privateNic.getIp4Address(), privateNic.getNetmask());
String publicCidr = NetUtils.ipAndNetMaskToCidr(secStorageVm.getPublicIpAddress(), secStorageVm.getPublicNetmask());
setupCmd.setAllowedInternalSites(allowedCidrs.toArray(new String[allowedCidrs.size()]));
}
String copyPasswd = _configDao.getValue("secstorage.copy.password");