apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix copying template

Browse Source 
Conflicts:

	console-proxy/scripts/ipfirewall.sh
This commit is contained in:
frank 2012-03-07 18:10:27 -08:00
parent 167b0367b3
commit 7f8cf5a9ff
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console-proxy/scripts/ipfirewall.sh
View File

@ -31,8 +31,6 @@ config_htaccess() {
}
ips(){
public_ip=`ip addr show eth2|grep "inet "|sed "s/^ *//"|cut -d "/" -f 1|cut -d " " -f 2`
ip route add $1 via $public_ip
echo "allow from $1" >> $HTACCESS
result=$?
return $result

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

@ -377,10 +377,6 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V
Nic privateNic = nics.get(0);
String privateCidr = NetUtils.ipAndNetMaskToCidr(privateNic.getIp4Address(), privateNic.getNetmask());
String publicCidr = NetUtils.ipAndNetMaskToCidr(secStorageVm.getPublicIpAddress(), secStorageVm.getPublicNetmask());
if (NetUtils.isNetworkAWithinNetworkB(privateCidr, publicCidr) || NetUtils.isNetworkAWithinNetworkB(publicCidr, privateCidr)) {
s_logger.info("private and public interface overlaps, add a default route through private interface. privateCidr: " + privateCidr + ", publicCidr: " + publicCidr);
allowedCidrs.add(NetUtils.ALL_CIDRS);
}
setupCmd.setAllowedInternalSites(allowedCidrs.toArray(new String[allowedCidrs.size()]));
}
String copyPasswd = _configDao.getValue("secstorage.copy.password");