From: Sage Weil <sage@newdream.net>
Date: Thu, 25 Mar 2021 17:36:56 +0000 (-0400)
Subject: qa/suites/upgrade/octopus-x: disable insecure global_id reclaim health warnings
X-Git-Tag: v16.2.1~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=67ce28d167e35f016ae57af3dcc1c4d02bef0151;p=ceph.git

qa/suites/upgrade/octopus-x: disable insecure global_id reclaim health warnings

These will trigger on upgrade; suppress them so that our health gates
will still work.

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

Conflicts:
	qa/suites/upgrade/octopus-x/rgw-multisite/overrides.yaml [
	  commit b6773dd3f197 ("qa/rgw: add octopus-x upgrade suite for
	  multisite") not in pacific ]
---

diff --git a/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml b/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml
index 33b1a83ac8a..80463a6c075 100644
--- a/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml
+++ b/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml
@@ -8,4 +8,6 @@ tasks:
       - radosgw-admin period update --rgw-realm=r --commit
       - ceph orch apply rgw r z --placement=2 --port=8000
       - sleep 120
+      - ceph config set mon mon_warn_on_insecure_global_id_reclaim false --force
+      - ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false --force
       - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
diff --git a/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml b/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml
index a765d7a27d6..c26119db572 100644
--- a/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml
+++ b/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml
@@ -26,6 +26,9 @@ tasks:
 - cephadm.shell:
     mon.a:
       - ceph config set mgr mgr/cephadm/use_repo_digest true --force
+      - ceph config set mon mon_warn_on_insecure_global_id_reclaim false --force
+      - ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false --force
+
 - print: "**** done cephadm.shell ceph config set mgr..."
 
 - print: "**** done start parallel"
diff --git a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/1-ceph-install/octopus.yaml b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/1-ceph-install/octopus.yaml
index 90a95841200..3d7a52a499f 100644
--- a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/1-ceph-install/octopus.yaml
+++ b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/1-ceph-install/octopus.yaml
@@ -14,6 +14,9 @@ tasks:
         bluestore_warn_on_legacy_statfs: false
         bluestore warn on no per pool omap: false
         mon pg warn min per osd: 0
+      mon:
+        mon_warn_on_insecure_global_id_reclaim: false
+        mon_warn_on_insecure_global_id_reclaim_allowed: false
     log-ignorelist:
       - Not found or unloadable
       - evicting unresponsive client
diff --git a/qa/suites/upgrade/octopus-x/stress-split/1-start.yaml b/qa/suites/upgrade/octopus-x/stress-split/1-start.yaml
index 71dfacba2cf..1aa90967e2c 100644
--- a/qa/suites/upgrade/octopus-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/octopus-x/stress-split/1-start.yaml
@@ -17,6 +17,9 @@ tasks:
 - cephadm.shell:
     mon.a:
       - ceph fs volume create foo
+      - ceph config set mon mon_warn_on_insecure_global_id_reclaim false --force
+      - ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false --force
+
 - ceph.healthy:
 
 - print: "**** upgrading first half of cluster, with stress ****"