Repository: cloudstack
Updated Branches:
  refs/heads/master b6621428a -> 94ee16a71


Fixed the wrong if else statement


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/94ee16a7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/94ee16a7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/94ee16a7

Branch: refs/heads/master
Commit: 94ee16a719a19fae57e2be5ab6398ce979ed55e9
Parents: b662142
Author: Santhosh Edukulla <santhosh.eduku...@gmail.com>
Authored: Mon Nov 10 22:33:19 2014 +0530
Committer: Santhosh Edukulla <santhosh.eduku...@gmail.com>
Committed: Mon Nov 10 22:33:19 2014 +0530

----------------------------------------------------------------------
 .../com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/94ee16a7/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index 8c9ea69..cad2b58 100644
--- 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -1199,12 +1199,7 @@ public class LibvirtStorageAdaptor implements 
StorageAdaptor {
             if (disk.getFormat() == PhysicalDiskFormat.TAR) {
                 newDisk = destPool.createPhysicalDisk(name, 
PhysicalDiskFormat.DIR, Storage.ProvisioningType.THIN, disk.getVirtualSize());
             } else {
-                /* If the source device is on a RBD storage pool force the new 
disk to the same format (RAW) */
-                if (srcPool.getType() != StoragePoolType.RBD) {
                     newDisk = destPool.createPhysicalDisk(name, 
Storage.ProvisioningType.THIN, disk.getVirtualSize());
-                } else {
-                    newDisk = destPool.createPhysicalDisk(name, 
Storage.ProvisioningType.THIN, disk.getVirtualSize());
-                }
             }
         } else {
             newDisk = new KVMPhysicalDisk(destPool.getSourceDir() + "/" + 
name, name, destPool);

Reply via email to