From: Michael Fritch <mfritch@suse.com>
Date: Wed, 26 May 2021 10:28:50 +0000 (-0600)
Subject: cephadm: rework mismatched release check
X-Git-Tag: v16.2.5~72^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ce4e34fbd04df751892e8af6c32e200ede10c86;p=ceph.git

cephadm: rework mismatched release check

allow for `--allow-mismatched-release` to be passed during unit tests

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 969eccffe92f337f8111347043063c665c67db94)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 158f0fa335fb..c26efc26a605 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -4019,14 +4019,15 @@ def command_bootstrap(ctx):
 
     image_ver = CephContainer(ctx, ctx.image, 'ceph', ['--version']).run().strip()
     logger.info(f'Ceph version: {image_ver}')
-    image_release = image_ver.split()[4]
-    if (
-        not ctx.allow_mismatched_release
-        and image_release not in [DEFAULT_IMAGE_RELEASE, LATEST_STABLE_RELEASE]
-    ):
-        raise Error(
-            f'Container release {image_release} != cephadm release {DEFAULT_IMAGE_RELEASE}; please use matching version of cephadm (pass --allow-mismatched-release to continue anyway)'
-        )
+
+    if not ctx.allow_mismatched_release:
+        image_release = image_ver.split()[4]
+        if image_release not in \
+                [DEFAULT_IMAGE_RELEASE, LATEST_STABLE_RELEASE]:
+            raise Error(
+                f'Container release {image_release} != cephadm release {DEFAULT_IMAGE_RELEASE};'
+                ' please use matching version of cephadm (pass --allow-mismatched-release to continue anyway)'
+            )
 
     logger.info('Extracting ceph user uid/gid from container image...')
     (uid, gid) = extract_uid_gid(ctx)