From e28ce91f3b71123a0eccc74f776e1432dfcb1553 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Fri, 16 Dec 2011 17:33:29 -0800
Subject: [PATCH] bug 12598: data disk should always be using scsi device.

---
 .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 3cccf4d7cb8..3d2fcfaf40a 100755
--- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1378,10 +1378,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
 	                	else
 	                		controllerKey = ideControllerKey;
                 	} else {
-	                	if(_rootDiskController == DiskControllerType.scsi)
-	                		controllerKey = scsiControllerKey;
-	                	else
-	                		controllerKey = ideControllerKey;
+                		controllerKey = scsiControllerKey;
                 	}
                 }