]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/cephadm: Add check fox already set image 35287/head
authorGeorgios Kyratsas <gkyratsas@suse.com>
Thu, 28 May 2020 10:42:37 +0000 (12:42 +0200)
committerGeorgios Kyratsas <gkyratsas@suse.com>
Thu, 28 May 2020 15:15:59 +0000 (17:15 +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>
qa/tasks/cephadm.py

index 0256cdbc247edfbab188fddfa5f40e0affcab636..afcec9cda35608fa03e00eb0af3fa4e8cb389104 100644 (file)
@@ -1078,7 +1078,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')