From: Sage Weil <sage@newdream.net>
Date: Fri, 26 Mar 2021 22:08:46 +0000 (-0400)
Subject: qa/tasks/ceph[adm].conf[.template]: disable insecure global_id reclaim health alerts
X-Git-Tag: v15.2.11~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1663a01d7864533ca4b19b4edaab1b8c4746feed;p=ceph.git

qa/tasks/ceph[adm].conf[.template]: disable insecure global_id reclaim health alerts

Turn these off everywhere for our tests so they don't interfere with our health checks.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 9f6fd4fe563c9cd4cf65316921d511b677c972e4)
---

diff --git a/qa/tasks/ceph.conf.template b/qa/tasks/ceph.conf.template
index d6826c39f844..f1a102dc8ee3 100644
--- a/qa/tasks/ceph.conf.template
+++ b/qa/tasks/ceph.conf.template
@@ -94,6 +94,10 @@
 	auth mon ticket ttl = 660      # 11m
 	auth service ticket ttl = 240  # 4m
 
+	# don't complain about insecure global_id in the test suite
+	mon_warn_on_insecure_global_id_reclaim = false
+	mon_warn_on_insecure_global_id_reclaim_allowed = false
+
 [client]
 	rgw cache enabled = true
 	rgw enable ops log = true
diff --git a/qa/tasks/cephadm.conf b/qa/tasks/cephadm.conf
index fe394cbfe6e8..4a7945ac31d2 100644
--- a/qa/tasks/cephadm.conf
+++ b/qa/tasks/cephadm.conf
@@ -77,6 +77,10 @@ mon reweight min bytes per osd = 10
 auth mon ticket ttl = 660      # 11m
 auth service ticket ttl = 240  # 4m
 
+# don't complain about global id reclaim
+mon_warn_on_insecure_global_id_reclaim = false
+mon_warn_on_insecure_global_id_reclaim_allowed = false
+
 [client.rgw]
 rgw cache enabled = true
 rgw enable ops log = true