Add return value for non-redis clusters
PROD-36960
Change-Id: Ief3edbc4f24b82f30b3a25e9291db2dbbcf9b107
diff --git a/src/com/mirantis/mcp/UpgradeChecks.groovy b/src/com/mirantis/mcp/UpgradeChecks.groovy
index c260baf..54d00f6 100644
--- a/src/com/mirantis/mcp/UpgradeChecks.groovy
+++ b/src/com/mirantis/mcp/UpgradeChecks.groovy
@@ -176,9 +176,13 @@
}
def check_36960 (salt, venvPepper, String cluster_name, Boolean raise_exc) {
+ def waStatus = [prodId: "PROD-36960", isFixed: "", waInfo: ""]
+
if (!salt.testTarget(venvPepper, 'I@redis:server')) {
- return
+ waStatus.isFixed = 'Nothing to do. There are no redis-servers.'
+ return waStatus
}
+
def redisVersionPillar = salt.getPillar(venvPepper, 'I@redis:server', 'redis:server:version').get("return")[0].values()[0]
List redisVersion = redisVersionPillar.toString().tokenize('.')
@@ -186,8 +190,6 @@
def majorVersion = redisVersion[0].toInteger()
def minorVersion = redisVersion[1].toInteger()
- def waStatus = [prodId: "PROD-36960", isFixed: "", waInfo: ""]
-
if (majorVersion >= 5 && minorVersion >= 0) {
waStatus.isFixed = 'Nothing to do. Redis-server version pillar is set to required version (5.0+).'
return waStatus