rbd: move setupEncryption() from buildCreateVolumeResponse to CreateVolume

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos
2021-04-01 13:18:28 +02:00
committed by mergify[bot]
parent bea9d56117
commit dc990037a5
3 changed files with 27 additions and 18 deletions

View File

@ -214,6 +214,12 @@ func (rv *rbdVolume) createCloneFromImage(ctx context.Context, parentVol *rbdVol
return err
}
if parentVol.isEncrypted() {
err = parentVol.copyEncryptionConfig(&rv.rbdImage)
if err != nil {
return fmt.Errorf("failed to copy encryption config for %q: %w", rv, err)
}
}
err = j.StoreImageID(ctx, rv.JournalPool, rv.ReservedID, rv.ImageID)
if err != nil {
util.ErrorLog(ctx, "failed to store volume %s: %v", rv, err)