Skip to content

Commit 1d4700a

Browse files
authored
Provide encryption key for DATA volume type (in addition to ROOT) to copy volume. (#9663)
1 parent b19c069 commit 1d4700a

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2511,7 +2511,9 @@ public Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd) {
25112511

25122512
destPool = storagePoolMgr.getStoragePool(destPrimaryStore.getPoolType(), destPrimaryStore.getUuid());
25132513
try {
2514-
if (srcVol.getPassphrase() != null && srcVol.getVolumeType().equals(Volume.Type.ROOT)) {
2514+
Volume.Type volumeType = srcVol.getVolumeType();
2515+
2516+
if (srcVol.getPassphrase() != null && (Volume.Type.ROOT.equals(volumeType) || Volume.Type.DATADISK.equals(volumeType))) {
25152517
volume.setQemuEncryptFormat(QemuObject.EncryptFormat.LUKS);
25162518
storagePoolMgr.copyPhysicalDisk(volume, destVolumeName, destPool, cmd.getWaitInMillSeconds(), srcVol.getPassphrase(), destVol.getPassphrase(), srcVol.getProvisioningType());
25172519
} else {

0 commit comments

Comments
 (0)