From: Or Ozeri <oro@il.ibm.com>
Date: Wed, 20 Jan 2021 10:59:06 +0000 (+0200)
Subject: qa/tasks/rbd: increase image size of encrypted disks
X-Git-Tag: v16.1.0^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ac21e3d08d81eca2a003b307c785b767bf6f719;p=ceph.git

qa/tasks/rbd: increase image size of encrypted disks

This commit increases the rbd image sizes in used by qemu to support the storage requirements of the luks encryption header.

Signed-off-by: Or Ozeri <oro@il.ibm.com>
(cherry picked from commit 114a7cfb2ea3cd86509588e0d528beb1494b36a0)
---

diff --git a/qa/tasks/qemu.py b/qa/tasks/qemu.py
index 5235c229b2f6..673ccdb144f9 100644
--- a/qa/tasks/qemu.py
+++ b/qa/tasks/qemu.py
@@ -20,6 +20,7 @@ log = logging.getLogger(__name__)
 DEFAULT_NUM_DISKS = 2
 DEFAULT_IMAGE_URL = 'http://download.ceph.com/qa/ubuntu-12.04.qcow2'
 DEFAULT_IMAGE_SIZE = 10240 # in megabytes
+ENCRYPTION_HEADER_SIZE = 16 # in megabytes
 DEFAULT_CPUS = 1
 DEFAULT_MEM = 4096 # in megabytes
 
@@ -81,11 +82,14 @@ def create_images(ctx, config, managers):
                     'image_url' in disk and
                     disk['encryption_format'] == 'none'):
                 continue
+            image_size = disk['image_size']
+            if disk['encryption_format'] != 'none':
+                image_size += ENCRYPTION_HEADER_SIZE
             create_config = {
                 client: {
                     'image_name': disk['image_name'],
                     'image_format': 2,
-                    'image_size': disk['image_size'],
+                    'image_size': image_size,
                     'encryption_format': disk['encryption_format'],
                     }
                 }