From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Oct 2016 20:16:17 +0000 (-0400)
Subject: rados/singleton-nomsgr: set require_*_osds in upgrade tests
X-Git-Tag: v11.1.1~58^2^2~81^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=50758a4810794d265c5d36a71d1e16799251a00d;p=ceph.git

rados/singleton-nomsgr: set require_*_osds in upgrade tests

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/suites/rados/singleton-nomsgr/all/13234.yaml b/suites/rados/singleton-nomsgr/all/13234.yaml
index a4d7829cbc57c..f5fd00f4ca307 100644
--- a/suites/rados/singleton-nomsgr/all/13234.yaml
+++ b/suites/rados/singleton-nomsgr/all/13234.yaml
@@ -216,6 +216,9 @@ tasks:
     - mon.a
     - mon.b
     - mon.c
+  - exec:
+      mon.a:
+        - ceph osd set require_kraken_osds
   - loop:
       body:
       - ceph_manager.set_pool_property:
diff --git a/suites/rados/singleton-nomsgr/all/16113.yaml b/suites/rados/singleton-nomsgr/all/16113.yaml
index 6977aafffbfef..16fdcb70af595 100644
--- a/suites/rados/singleton-nomsgr/all/16113.yaml
+++ b/suites/rados/singleton-nomsgr/all/16113.yaml
@@ -62,6 +62,9 @@ tasks:
 - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2]
 - sleep:
     duration: 10
+- exec:
+    mon.a:
+      - ceph osd set require_kraken_osds
 - ceph_manager.wait_for_clean: null
 - exec:
     mon.a:
diff --git a/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml b/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
index c6602968a0ebb..895c26d49a440 100644
--- a/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
+++ b/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
@@ -70,6 +70,9 @@ tasks:
   - install.upgrade:
       mon.a: null
   - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1]
+  - exec:
+      mon.a:
+        - ceph osd set require_kraken_osds
   - ceph_manager.wait_for_clean: null
   - ceph_manager.do_pg_scrub:
       args: ['test', 0, 'scrub']
diff --git a/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml b/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml
index 940c981027102..2b2cfd0ab073c 100644
--- a/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml
+++ b/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml
@@ -70,6 +70,9 @@ tasks:
   - install.upgrade:
       mon.a: null
   - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1]
+  - exec:
+      mon.a:
+        - ceph osd set require_kraken_osds
   - ceph_manager.wait_for_clean: null
   - ceph_manager.do_pg_scrub:
       args: ['test', 0, 'scrub']