qa/tasks/cephadm: add support for distro-suffix

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 5d48c904e619c64c314c3b82037999acc6bebfef..3038e4db53c3a9de87152adb52464d76c73885aa 100644 (file)
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -1964,19 +1964,20 @@ def task(ctx, config):
                             "section.")
         sha1 = config.get('sha1')
         flavor = config.get('flavor', 'default')
+        distro_suffix = config.get('distro-suffix', None)
 
         if any(_ in container_image_name for _ in (':', '@')):
             log.info('Provided image contains tag or digest, using it as is')
             ctx.ceph[cluster_name].image = container_image_name
-        elif sha1:
-            if flavor == "crimson-debug" or flavor == "crimson-release":
-                ctx.ceph[cluster_name].image = container_image_name + ':' + sha1 + '-' + flavor
-            else:
-                ctx.ceph[cluster_name].image = container_image_name + ':' + sha1
-            ref = sha1
         else:
-            # fall back to using the branch value
+            if sha1:
+                ref = sha1
             ctx.ceph[cluster_name].image = container_image_name + ':' + ref
+
+            if distro_suffix is not None:
+                ctx.ceph[cluster_name].image += '-' + distro_suffix
+            if flavor == "crimson-debug" or flavor == "crimson-release":
+                ctx.ceph[cluster_name].image += '-' + flavor
     log.info('Cluster image is %s' % ctx.ceph[cluster_name].image)