From: Georgios Kyratsas <gkyratsas@suse.com>
Date: Thu, 28 May 2020 10:42:37 +0000 (+0200)
Subject: qa/tasks/cephadm: Add check fox already set image
X-Git-Tag: v15.2.4~69^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8dfca65987c55f3a4b51d5c96fca05b847ff556c;p=ceph.git

qa/tasks/cephadm: Add check fox already set image

Adding a check for already bootstrapped clusters where the image is
already set to avoid overriding it.

Signed-off-by: Georgios Kyratsas <gkyratsas@suse.com>
(cherry picked from commit fabcbeab2c5c8819ce20134fe316e102090dc00f)
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 57efb1ab4929..b8990ef085e0 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -1080,7 +1080,8 @@ def task(ctx, config):
         ctx.ceph[cluster_name].bootstrapped = False
  
     # image
-    ctx.ceph[cluster_name].image = config.get('image')
+    if not hasattr(ctx.ceph[cluster_name], 'image'):
+        ctx.ceph[cluster_name].image = config.get('image')
     ref = None
     if not ctx.ceph[cluster_name].image:
         sha1 = config.get('sha1')