Updated Branches: refs/heads/master e116c2498 -> 3996094e5
Fix bug: can not deploy VM on ESXi due to incorrect secondaryStorageResource used for SSVM Issue: For deploying VMware VMs, cloud service on SSVM needs to be started with PremiumSecondaryStorageResource, a bunch of VMware related commands rely on it. Changes: 1)include cloud-vmware.jar in systemvm.zip 2)start cloud service in SSVM with PremiumSecondaryStorageResource RB: https://reviews.apache.org/r/6320/ Send-by: [email protected] Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3996094e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3996094e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3996094e Branch: refs/heads/master Commit: 3996094e550a73bdfd48a08e3b389559df41496e Parents: e116c24 Author: Edison Su <[email protected]> Authored: Thu Aug 2 11:20:35 2012 -0700 Committer: Edison Su <[email protected]> Committed: Thu Aug 2 11:20:35 2012 -0700 ---------------------------------------------------------------------- build/build-cloud.xml | 1 + .../secondary/SecondaryStorageManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3996094e/build/build-cloud.xml ---------------------------------------------------------------------- diff --git a/build/build-cloud.xml b/build/build-cloud.xml index b8ad09e..b4d120f 100755 --- a/build/build-cloud.xml +++ b/build/build-cloud.xml @@ -131,6 +131,7 @@ <property name="console-proxy.jar" value="cloud-console-proxy.jar" /> <property name="api.jar" value="cloud-api.jar"/> <property name="vmware-base.jar" value="cloud-vmware-base.jar" /> + <property name="vmware.jar" value="cloud-vmware.jar" /> <!-- Import information about the build version and company information http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3996094e/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index 3ef055d..d4ad7b0 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -1063,7 +1063,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V if (profile.getHypervisorType() == HypervisorType.Hyperv) { buf.append(" resource=com.cloud.storage.resource.CifsSecondaryStorageResource"); } else { - buf.append(" resource=com.cloud.storage.resource.NfsSecondaryStorageResource"); + buf.append(" resource=com.cloud.storage.resource.PremiumSecondaryStorageResource"); } } else { buf.append(" resource=com.cloud.storage.resource.NfsSecondaryStorageResource");
