don't return euca home (SAN backend).

eucalyptus · Feb 16, 2011 · 568b722 · 568b722
2 parents 0b1ff9f + c4ab8aa
commit 568b722
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/EquallogicProvider.java b/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/EquallogicProvider.java
@@ -210,7 +210,7 @@ public String getVolumeProperty(String volumeId) {
 			SANVolumeInfo volumeInfo = db.getUnique(searchVolumeInfo);
 			EntityWrapper<CHAPUserInfo> dbUser = db.recast(CHAPUserInfo.class);
 			CHAPUserInfo userInfo = dbUser.getUnique(new CHAPUserInfo("eucalyptus"));
-			String property = System.getProperty("euca.home") + "," + sanInfo.getSanHost() + "," + volumeInfo.getIqn() + "," + BlockStorageUtil.encryptNodeTargetPassword(BlockStorageUtil.decryptSCTargetPassword(userInfo.getEncryptedPassword()));
+			String property = sanInfo.getSanHost() + "," + volumeInfo.getIqn() + "," + BlockStorageUtil.encryptNodeTargetPassword(BlockStorageUtil.decryptSCTargetPassword(userInfo.getEncryptedPassword()));
 			db.commit();
 			return property;
 		} catch(EucalyptusCloudException ex) {

diff --git a/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/NetappProvider.java b/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/NetappProvider.java
@@ -666,8 +666,7 @@ public String getVolumeProperty(String volumeId) {
 			SANInfo sanInfo = SANInfo.getStorageInfo();
 			SANVolumeInfo searchVolumeInfo = new SANVolumeInfo(volumeId);
 			SANVolumeInfo volumeInfo = db.getUnique(searchVolumeInfo);
-			String property = System.getProperty("euca.home") + "," + 
-			sanInfo.getSanHost() + "," + 
+			String property = sanInfo.getSanHost() + "," + 
 			volumeInfo.getIqn() + "," + "not_required";
 			db.commit();
 			return property;