]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/cephadm: Add check fox already set image
authorGeorgios Kyratsas <gkyratsas@suse.com>
Thu, 28 May 2020 10:42:37 +0000 (12:42 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 2 Jun 2020 12:58:27 +0000 (14:58 +0200)
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)

qa/tasks/cephadm.py

index 57efb1ab49293c0773531f0d9c15c48df22d756b..b8990ef085e08f7dc336b11f31bc28690f72b5bd 100644 (file)
@@ -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')