From: Sage Weil <sage@redhat.com>
Date: Thu, 28 Mar 2019 16:19:05 +0000 (-0500)
Subject: qa/suites/rados/thrash-old-clients: fix up v1/v2 options
X-Git-Tag: v15.0.0~39^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27249%2Fhead;p=ceph.git

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 1f9cd277e700..933aebb3ea61 100644
--- 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 5468e5205855..9dd47f4f9929 100644
--- 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 eae5ffc2677b..824fbe44a2e5 100644
--- 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 09698142972a..864184827cb2 100644
--- 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 eb9a3a2ecc7e..30edfcf9e9c0 100644
--- 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 3ea7bf87d00c..d63e07d194cc 100644
--- 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 8ac2a7bd22f5..a7449e4d0326 100644
--- 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 55fcd32ab0a7..01975defac60 100644
--- 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 364f9d03b06b..5df450dc9565 100644
--- 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