Check for auth_allow_insecure_global_id_reclaim option should
performed only for Ceph Nautilus version
PROD-36632
Change-Id: Ib2a9b35218ebab127bac2acc43a12d4e84b442d0
(cherry picked from commit 36ef13b34df30ab2e2ff19917be6ff7c0bad80ea)
diff --git a/src/com/mirantis/mcp/UpgradeChecks.groovy b/src/com/mirantis/mcp/UpgradeChecks.groovy
index 60ab9a6..c9b0192 100644
--- a/src/com/mirantis/mcp/UpgradeChecks.groovy
+++ b/src/com/mirantis/mcp/UpgradeChecks.groovy
@@ -139,8 +139,9 @@
def check_36461_2 (salt, venvPepper, String cluster_name, Boolean raise_exc) {
def cephMonPillar = salt.getPillar(venvPepper, 'I@ceph:mon', 'ceph:common:config:mon:auth_allow_insecure_global_id_reclaim').get("return")[0].values()[0]
+ def cephVersion = salt.getPillar(venvPepper, 'I@ceph:mon', 'ceph:common:version').get("return")[0].values()[0]
def waStatus = [prodId: "PROD-36461_2", isFixed: "", waInfo: ""]
- if (cephMonPillar.toString().toLowerCase() != 'false') {
+ if (cephMonPillar.toString().toLowerCase() != 'false' && cephVersion.toString().toLowerCase() == 'nautilus') {
waStatus.isFixed = "Work-around should be applied manually"
waStatus.waInfo = "See https://docs.mirantis.com/mcp/q4-18/mcp-release-notes/single/index.html#i-cve-2021-20288 for more info"
if (raise_exc) {