qa/suites/upgrade: install old version with only v1 addrs

v1+v2 support is new in nautilus.

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

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml
index 290eca8102fae5a32418685fde222ee4c10bae28..24f8ca0bd7df53a33aefdc97ea3451f56760a0e0 100644 (file)
--- a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml
@@ -5,6 +5,8 @@ meta:
    Use xfs beneath the osds.
 overrides:
   ceph:
+    mon_bind_addrvec: false
+    mon_bind_msgr2: false
     fs: xfs
     conf:
       global:

diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
index 2373e3d5138d389e465310323c601f964e41e7a2..16bc2907c281ff20a94c1c438704d652644d3641 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
@@ -20,6 +20,8 @@ roles:
   - client.3
 overrides:
   ceph:
+    mon_bind_msgr2: false
+    mon_bind_addrvec: false
     log-whitelist:
     - scrub mismatch
     - ScrubResult

diff --git a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml
index a4699731279f43166bb9d49a7b1a31b5ca89d944..e004d4e2f3a9712886328da0683d370eb97bc2c5 100644 (file)
--- a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml
+++ b/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml
@@ -5,6 +5,8 @@ meta:
    Use xfs beneath the osds.
 overrides:
   ceph:
+    mon_bind_msgr2: false
+    mon_bind_addrvec: false
     fs: xfs
     log-whitelist:
       - overall HEALTH_

diff --git a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
index 1839036742063a9a8d59b8b0665ac87869e23084..f633d7e3ef9f2848d1ec4328fb32403ccba158bf 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
@@ -20,6 +20,8 @@ roles:
   - client.3
 overrides:
   ceph:
+    mon_bind_msgr2: false
+    mon_bind_addrvec: false
     log-whitelist:
     - scrub mismatch
     - ScrubResult

diff --git a/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml
index d71647f927395db17c0fd3ac9bcfaca7efd8e502..911ee277b4f3da03c027de1b91f8849cfce4ca22 100644 (file)
--- a/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml
+++ b/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml
@@ -5,6 +5,8 @@ meta:
    Use xfs beneath the osds.
 overrides:
   ceph:
+    mon_bind_msgr2: false
+    mon_bind_addrvec: false
     fs: xfs
     log-whitelist:
       - overall HEALTH_