From fa96deec280e94bfe487daa620d957293036a896 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Fri, 18 Feb 2011 17:08:34 -0800
Subject: [PATCH] Make secondary storage VM support premium version and
 opensource version

---
 build/build-cloud.properties                  | 31 -------------------
 .../SecondaryStorageManagerImpl.java          |  5 ++-
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/build/build-cloud.properties b/build/build-cloud.properties
index 4ee5aba22c3..7075f7b7342 100755
--- a/build/build-cloud.properties
+++ b/build/build-cloud.properties
@@ -7,34 +7,3 @@ target.compat.version=1.6
 source.compat.version=1.6
 branding.name=default
 
-#
-# Set your own default instance for server-server-dev.xml
-# 
-
-#default.zone=KY
-#default.instance=KY
-
-#
-# Set your own log directory
-# for production build set logdir=/var/log/vmops
-#
-#logdir=logs
-
-
-#
-# Set your own KVM developer.properties values
-#
-
-#private.macaddr.start=00:16:3e:77:03:01
-#private.ipaddr.start=192.168.168.128
-
-
-#
-# Set your own agent.properties values
-#
-
-#WORKERS=3
-#HOST=192.168.1.190
-#PORT=8250
-#POD=KY
-#ZONE=KY
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
index eebee870b75..284d34c3c95 100644
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
@@ -977,7 +977,10 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V
         }
 
         buf.append(" mount.path=").append(nfsMountPoint);
-        buf.append(" resource=com.cloud.storage.resource.NfsSecondaryStorageResource");
+        if(_configDao.isPremium())
+            buf.append(" resource=com.cloud.storage.resource.PremiumSecondaryStorageResource");
+        else	
+        	buf.append(" resource=com.cloud.storage.resource.NfsSecondaryStorageResource");
         buf.append(" instance=SecStorage");
         buf.append(" sslcopy=").append(Boolean.toString(_useSSlCopy));