qa/suites/rados/thrash-old-clients: fix up v1/v2 options

- don't specify ceph.py options in the ceph.py
- instead, specify them in the per-version facet

Note that we don't currently have a way to do v2 only for the mon IPs, so
in the v2only cases, we are still binding the mons to v1.

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

diff --git a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
index 1f9cd277e700af345a56ff2c2e503598d09ee00a..933aebb3ea61726012dcf38b1e455926d461576f 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
@@ -1,7 +1,11 @@
 overrides:
   ceph:
+    mon_bind_addrvec: false
+    mon_bind_msgr2: false
     crush_tunables: hammer
     conf:
+      global:
+        ms bind msgr2: false
       mon:
         mon osd initial require min compat client: hammer
 tasks:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
index 5468e520585527a4b301d32c31b9db4d5b91418a..9dd47f4f9929e5be0556b53ee2227a81bbbbf26d 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
@@ -1,5 +1,6 @@
 overrides:
   ceph:
+    mon_bind_addrvec: false
     mon_bind_msgr2: false
     conf:
       global:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
index eae5ffc2677b634e7092f0ad3d0c6bd2490e9fa6..824fbe44a2e5273aafccd03c2c34ded34a710710 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
@@ -1,3 +1,10 @@
+overrides:
+  ceph:
+    mon_bind_addrvec: false
+    mon_bind_msgr2: false
+    conf:
+      global:
+        mon warn on msgr2 not enabled: false
 tasks:
 - install:
     branch: jewel

diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
index 09698142972a166abbcf53b170a8d7bf61a60b83..864184827cb205bf6f1e82dd228df51b88dc8d07 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
@@ -1,6 +1,7 @@
 overrides:
   ceph:
     mon_bind_msgr2: false
+    mon_bind_addrvec: false
     conf:
       global:
         ms type: async

diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
index eb9a3a2ecc7eab32f845f0a9ea1f072a80d4f0f0..30edfcf9e9c07b5301587b726f3b990d652d2190 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
@@ -1,3 +1,10 @@
+overrides:
+  ceph:
+    mon_bind_addrvec: false
+    mon_bind_msgr2: false
+    conf:
+      global:
+        mon warn on msgr2 not enabled: false
 tasks:
 - install:
     branch: luminous

diff --git a/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
index 3ea7bf87d00cc31a1f5b3a4ae20c2a479bfbf59d..d63e07d194cc43c88f64bae2b101dcee30d6af92 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
@@ -1,5 +1,6 @@
 overrides:
   ceph:
+    mon_bind_addrvec: false
     mon_bind_msgr2: false
     conf:
       global:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml
index 8ac2a7bd22f5f62e82daa6b8676aafaaa7d01cdc..a7449e4d0326e1bcad983af8c252e538ef3e1056 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml
@@ -1,3 +1,11 @@
+overrides:
+  ceph:
+    mon_bind_addrvec: false
+    mon_bind_msgr2: false
+    conf:
+      global:
+        ms type: async
+        mon warn on msgr2 not enabled: false
 tasks:
 - install:
     branch: mimic

diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml
index 55fcd32ab0a726fab8517dbe9f954df889a46bf0..01975defac60e282c0773947d94da8aba698a4d4 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml
@@ -1,6 +1,7 @@
 overrides:
   ceph:
     mon_bind_msgr2: false
+    mon_bind_addrvec: false
     conf:
       global:
         ms type: async

diff --git a/qa/suites/rados/thrash-old-clients/ceph.yaml b/qa/suites/rados/thrash-old-clients/ceph.yaml
index 364f9d03b06bca5951620528da2f2c366c96f437..5df450dc9565b43aa43487c45671a6b2794cecbf 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/ceph.yaml
+++ b/qa/suites/rados/thrash-old-clients/ceph.yaml
@@ -1,7 +1,2 @@
 tasks:
 - ceph:
-    mon_bind_addrvec: false
-    mon_bind_msgr2: false
-    conf:
-      global:
-        ms bind msgr2: false