From 3996094e550a73bdfd48a08e3b389559df41496e Mon Sep 17 00:00:00 2001
From: Edison Su <sudison@gmail.com>
Date: Thu, 2 Aug 2012 11:20:35 -0700
Subject: [PATCH] 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: mice_xia@tcloudcomputing.com
---
 build/build-cloud.xml                                           | 1 +
 .../cloud/storage/secondary/SecondaryStorageManagerImpl.java    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index b8ad09edc30..b4d120ff2d8 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
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
index 3ef055d74c0..d4ad7b0a789 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");