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/rados/cephadm/upgrade/3-start-upgrade.yaml [ commit
	  04a3d4c927e7 ("qa/suites/rados/cephadm/upgrade: deploy a legacy
	  r.z-style rgw") not in octopus ]
	qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml [ no octopus-x
	  upgrade suite in octopus ]
	qa/suites/upgrade/octopus-x/rgw-multisite/overrides.yaml [ ditto ]
	qa/suites/upgrade/octopus-x/stress-split/1-start.yaml [ ditto ]

diff --git a/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml b/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml
index f13b2e07ce7137c50f09074c165b16143dbeab65..8f8c56a08434da9b4bbea7e81f9f3bf3ae5cc37d 100644 (file)
--- a/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml
+++ b/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml
@@ -2,4 +2,6 @@ tasks:
 - cephadm.shell:
     env: [sha1]
     mon.a:
+      - 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/nautilus-x/stress-split/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml
index 62469c09008e8433dbb1b7d63bc8be180d9d0278..f6d34bda0802d0110c2df7444977e827c0964fb4 100644 (file)
--- a/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml
+++ b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.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:
       - evicting unresponsive client
 - exec: