From: Sage Weil <sage@redhat.com>
Date: Tue, 4 Dec 2018 22:33:43 +0000 (-0600)
Subject: qa/suites/upgrade: install old version with only v1 addrs
X-Git-Tag: v14.1.0~484^2~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0692d069793d37b35b64c1c5d81ad67edc54808b;p=ceph.git

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 290eca8102fa..24f8ca0bd7df 100644
--- 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 2373e3d5138d..16bc2907c281 100644
--- 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 a4699731279f..e004d4e2f3a9 100644
--- 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 183903674206..f633d7e3ef9f 100644
--- 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 d71647f92739..911ee277b4f3 100644
--- 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_