From: Sage Weil <sage@newdream.net>
Date: Wed, 8 Apr 2020 20:46:36 +0000 (-0500)
Subject: qa/suites/fs/upgrade: start with msgr2
X-Git-Tag: v17.0.0~2656^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8aa9c88f3e910ef46346991fc63fb7bcd704f561;p=ceph.git

qa/suites/fs/upgrade: start with msgr2

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

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml
index a11cb1128beee..40a7d767d7c73 100644
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml
@@ -14,8 +14,6 @@ tasks:
     extra_packages: ['librados2']
 - print: "**** done installing nautilus"
 - ceph:
-    mon_bind_addrvec: false
-    mon_bind_msgr2: false
     log-whitelist:
       - overall HEALTH_
       - \(FS_
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
index 55470718ba3d1..a8d44b51a4b5c 100644
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
@@ -1,7 +1,5 @@
 overrides:
   ceph:
-    mon_bind_msgr2: false
-    mon_bind_addrvec: false
     log-whitelist:
     - scrub mismatch
     - ScrubResult
@@ -29,9 +27,6 @@ tasks:
     daemons: [mon.*, mgr.*]
     mon-health-to-clog: false
     wait-for-healthy: false
-- exec:
-    mon.a:
-      - ceph config set global mon_warn_on_msgr2_not_enabled false
 - ceph.healthy:
 - ceph.restart:
     daemons: [osd.*]
@@ -46,8 +41,6 @@ tasks:
     mon.a:
     - ceph osd dump -f json-pretty
     - ceph versions
-    - ceph mon enable-msgr2
-    - ceph config rm global mon_warn_on_msgr2_not_enabled
     - ceph osd require-osd-release octopus
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
     #- ceph osd set-require-min-compat-client nautilus
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml
index a11cb1128beee..40a7d767d7c73 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml
@@ -14,8 +14,6 @@ tasks:
     extra_packages: ['librados2']
 - print: "**** done installing nautilus"
 - ceph:
-    mon_bind_addrvec: false
-    mon_bind_msgr2: false
     log-whitelist:
       - overall HEALTH_
       - \(FS_
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
index aeb17e56fad2a..cc2d92fac686a 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
@@ -1,7 +1,5 @@
 overrides:
   ceph:
-    mon_bind_msgr2: false
-    mon_bind_addrvec: false
     log-whitelist:
     - scrub mismatch
     - ScrubResult
@@ -29,9 +27,6 @@ tasks:
     daemons: [mon.*, mgr.*]
     mon-health-to-clog: false
     wait-for-healthy: false
-- exec:
-    mon.a:
-      - ceph config set global mon_warn_on_msgr2_not_enabled false
 - ceph.healthy:
 - ceph.restart:
     daemons: [osd.*]
@@ -44,10 +39,8 @@ tasks:
     wait-for-osds-up: true
 - exec:
     mon.a:
-    - ceph mon enable-msgr2
     - ceph versions
     - ceph osd dump -f json-pretty
-    - ceph config rm global mon_warn_on_msgr2_not_enabled
     - ceph osd require-osd-release octopus
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
     #- ceph osd set-require-min-compat-client nautilus
diff --git a/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-nautilus.yaml b/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-nautilus.yaml
index 81cc5bab41f9a..f4e86757621da 100644
--- a/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-nautilus.yaml
+++ b/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-nautilus.yaml
@@ -15,8 +15,6 @@ tasks:
     extra_packages: ['librados2']
 - print: "**** done installing nautilus"
 - ceph:
-    mon_bind_addrvec: false
-    mon_bind_msgr2: false
     log-whitelist:
       - overall HEALTH_
       - \(FS_
diff --git a/qa/suites/fs/upgrade/volumes/import-legacy/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/volumes/import-legacy/tasks/2-upgrade.yaml
index 715ef4887bd99..2b7a8a84c4f62 100644
--- a/qa/suites/fs/upgrade/volumes/import-legacy/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/volumes/import-legacy/tasks/2-upgrade.yaml
@@ -1,7 +1,5 @@
 overrides:
   ceph:
-    mon_bind_msgr2: false
-    mon_bind_addrvec: false
     log-whitelist:
     - scrub mismatch
     - ScrubResult
@@ -28,9 +26,6 @@ tasks:
     daemons: [mon.*, mgr.*]
     mon-health-to-clog: false
     wait-for-healthy: false
-- exec:
-    mon.a:
-      - ceph config set global mon_warn_on_msgr2_not_enabled false
 - ceph.healthy:
 - ceph.restart:
     daemons: [osd.*]
@@ -43,10 +38,8 @@ tasks:
     wait-for-osds-up: true
 - exec:
     mon.a:
-    - ceph mon enable-msgr2
     - ceph versions
     - ceph osd dump -f json-pretty
-    - ceph config rm global mon_warn_on_msgr2_not_enabled
     - ceph osd require-osd-release octopus
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
     #- ceph osd set-require-min-compat-client nautilus