This is an automated email from the ASF dual-hosted git repository.
joao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 1d4700a0bdd Provide encryption key for DATA volume type (in addition
to ROOT) to copy volume. (#9663)
1d4700a0bdd is described below
commit 1d4700a0bdd8404a78fad74a25d92ba2304f5595
Author: mprokopchuk <mprokopc...@gmail.com>
AuthorDate: Thu Sep 12 09:03:23 2024 -0700
Provide encryption key for DATA volume type (in addition to ROOT) to copy
volume. (#9663)
---
.../java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index e51f8fc8152..04662604382 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -2511,7 +2511,9 @@ public class KVMStorageProcessor implements
StorageProcessor {
destPool =
storagePoolMgr.getStoragePool(destPrimaryStore.getPoolType(),
destPrimaryStore.getUuid());
try {
- if (srcVol.getPassphrase() != null &&
srcVol.getVolumeType().equals(Volume.Type.ROOT)) {
+ Volume.Type volumeType = srcVol.getVolumeType();
+
+ if (srcVol.getPassphrase() != null &&
(Volume.Type.ROOT.equals(volumeType) ||
Volume.Type.DATADISK.equals(volumeType))) {
volume.setQemuEncryptFormat(QemuObject.EncryptFormat.LUKS);
storagePoolMgr.copyPhysicalDisk(volume, destVolumeName,
destPool, cmd.getWaitInMillSeconds(), srcVol.getPassphrase(),
destVol.getPassphrase(), srcVol.getProvisioningType());
} else {
