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

Merge branch '2.1.x' of ssh://anthony@git.cloud.com/var/lib/git/cloudstack-oss into 2.1.x

This commit is contained in:
anthony 2010-10-29 20:00:52 -07:00
parent 80a32ad031 18205acb3b
commit f802808613
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -989,13 +989,20 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
} else {
args = "-D";
}
String cidrSize = Long.toString(NetUtils.getCidrSize(vlanNetmask));
if (sourceNat) {
args += " -f";
args += " -l ";
args += publicIpAddress + "/" + cidrSize;
} else if (firstIP) {
args += " -l ";
args += publicIpAddress + "/" + cidrSize;
} else {
args += " -l ";
args += publicIpAddress;
}
args += " -i ";
args += privateIpAddress;
args += " -l ";
args += publicIpAddress;
args += " -c ";
args += "eth" + correctVif.getDevice(conn);
args += " -g ";

2
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -1142,11 +1142,11 @@ public class UserVmManagerImpl implements UserVmManager {
);
userVm.setGuestMacAddress(vmMacAddress);
_vmDao.update(userVm.getId(), userVm);
txn.commit();
if (routerLock) {
_routerDao.release(routerId);
routerLock = false;
}
txn.commit();
return ipAddressStr;
}finally {
if (routerLock) {

1
setup/db/schema-213to214.sql
View File

@ -1 +1,2 @@
ALTER TABLE `cloud`.`vm_instance` MODIFY COLUMN `pod_id` bigint unsigned; -- remove NOT NULL constraint to allow creating DB record in early time
ALTER TABLE `cloud`.`storage_pool` MODIFY COLUMN `uuid` varchar(255) UNIQUE; -- remove NOT NULL constraint to allow creating DB record in early time