From 80fe5d81cca38370bc78176e81416806ea1339d5 Mon Sep 17 00:00:00 2001
From: "Sigunov, Vladimir (vs422h)" <vs422h@att.com>
Date: Fri, 4 Mar 2022 16:36:09 -0500
Subject: [PATCH] [CEPH] Less agressive checks in mgr deployment

Ceph cluster needs only one active manager to function properly.
This PS converts ceph-client-tests rules related to ceph-mgr deployment
from error into warning if the number of standby mgrs is less
than expected.

Change-Id: I53c83c872b95da645da69eabf0864daff842bbd1
---
 ceph-client/Chart.yaml                       | 2 +-
 ceph-client/templates/bin/_helm-tests.sh.tpl | 4 ++--
 releasenotes/notes/ceph-client.yaml          | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml
index b79e7e109..f7686f242 100644
--- a/ceph-client/Chart.yaml
+++ b/ceph-client/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Client
 name: ceph-client
-version: 0.1.31
+version: 0.1.32
 home: https://github.com/ceph/ceph-client
 ...
diff --git a/ceph-client/templates/bin/_helm-tests.sh.tpl b/ceph-client/templates/bin/_helm-tests.sh.tpl
index 136d7190b..fa40068d2 100755
--- a/ceph-client/templates/bin/_helm-tests.sh.tpl
+++ b/ceph-client/templates/bin/_helm-tests.sh.tpl
@@ -117,8 +117,8 @@ function mgr_validation() {
     then
       echo "Cluster has 1 Active MGR, $mgr_stdby_count Standbys MGR"
     else
-      echo "Cluster Standbys MGR: Expected count= $expected_standbys Available=$mgr_stdby_count"
-      retcode=1
+      echo "Warning. Cluster Standbys MGR: Expected count= $expected_standbys Available=$mgr_stdby_count"
+      echo "If this is not expected behavior, please investigate and take some additional actions."
     fi
 
   else
diff --git a/releasenotes/notes/ceph-client.yaml b/releasenotes/notes/ceph-client.yaml
index 7936f3c4a..5f9f6f0a6 100644
--- a/releasenotes/notes/ceph-client.yaml
+++ b/releasenotes/notes/ceph-client.yaml
@@ -32,4 +32,5 @@ ceph-client:
   - 0.1.29 Consolidate mon_host discovery
   - 0.1.30 Move ceph-mgr deployment to the ceph-mon chart
   - 0.1.31 Consolidate mon_endpoints discovery
+  - 0.1.32 Simplify test rules for ceph-mgr deployment
 ...