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 06dc8eb748229bb8d7fda240cb8b7e6d7f605c96..609a124b82d891753e5f7a40f4969668931e6359 100644 (file)
--- a/qa/tasks/ceph.conf.template
+++ b/qa/tasks/ceph.conf.template
@@ -95,6 +95,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 fe394cbfe6e8d3e18a9112219ca00025db758dbb..4a7945ac31d2a264f20ee36e8137b5bb57831073 100644 (file)
--- 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