From: Georgios Kyratsas <34770824+gekios@users.noreply.github.com>
Date: Thu, 9 Jul 2020 12:47:37 +0000 (+0200)
Subject: Merge pull request #35927 from gekios/wip-cephadm-image-fix
X-Git-Tag: wip-pdonnell-testing-20200918.022351~719
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e50ee34961b08ab095d77735c81a536d9e7c80a;p=ceph-ci.git

Merge pull request #35927 from gekios/wip-cephadm-image-fix

qa/tasks: fix cephadm config image check
---

7e50ee34961b08ab095d77735c81a536d9e7c80a
diff --cc qa/tasks/cephadm.py
index 228fc744914,34b445133c0..211286c4f8a
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@@ -1155,14 -1149,15 +1149,20 @@@ def task(ctx, config)
          ctx.ceph[cluster_name].image = config.get('image')
      ref = None
      if not ctx.ceph[cluster_name].image:
+         if not container_image_name:
+             raise Exception("Configuration error occurred. "
+                             "The 'image' value is undefined for 'cephadm' task. "
+                             "Please provide corresponding options in the task's "
+                             "config, task 'overrides', or teuthology 'defaults' "
+                             "section.")
          sha1 = config.get('sha1')
 +        flavor = config.get('flavor', 'default')
 +
          if sha1:
 -            ctx.ceph[cluster_name].image = container_image_name + ':' + sha1
 +            if flavor == "crimson":
 +                ctx.ceph[cluster_name].image = container_image_name + ':' + sha1 + '-' + flavor
 +            else:
 +                ctx.ceph[cluster_name].image = container_image_name + ':' + sha1
              ref = sha1
          else:
              # hmm, fall back to branch?