From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 11 Mar 2019 16:06:32 +0000 (-0700)
Subject: qa: stop testing simple messenger in CephFS suites
X-Git-Tag: v14.2.0~49^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=897a1f738566263fde42832dc23f34a99a554b62;p=ceph.git

qa: stop testing simple messenger in CephFS suites

Simple messenger is on it's way out and it doesn't work with msgr2.

Fixes: http://tracker.ceph.com/issues/38676
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/task/test/test.yaml b/qa/suites/fs/basic_functional/tasks/volume-client/task/test/test.yaml
index f038721cb3b67..d766b6eca4c57 100644
--- a/qa/suites/fs/basic_functional/tasks/volume-client/task/test/test.yaml
+++ b/qa/suites/fs/basic_functional/tasks/volume-client/task/test/test.yaml
@@ -1,11 +1,3 @@
-overrides:
-  ceph:
-    mon_bind_msgr2: false
-    conf:
-      global:
-        ms type: simple
-        ms bind msgr2: false
-
 tasks:
   - cephfs_test_runner:
       modules:
diff --git a/qa/suites/kcephfs/recovery/tasks/sessionmap.yaml b/qa/suites/kcephfs/recovery/tasks/sessionmap.yaml
index 9e3c8b645c727..88ae6019a7c6f 100644
--- a/qa/suites/kcephfs/recovery/tasks/sessionmap.yaml
+++ b/qa/suites/kcephfs/recovery/tasks/sessionmap.yaml
@@ -1,9 +1,5 @@
-
 overrides:
   ceph:
-    conf:
-      global:
-        ms type: simple
     log-whitelist:
       - client session with non-allowable root
 
diff --git a/qa/suites/kcephfs/recovery/tasks/volume-client.yaml b/qa/suites/kcephfs/recovery/tasks/volume-client.yaml
index d738eebf12f6a..5dfb2f8555b88 100644
--- a/qa/suites/kcephfs/recovery/tasks/volume-client.yaml
+++ b/qa/suites/kcephfs/recovery/tasks/volume-client.yaml
@@ -1,10 +1,3 @@
-
-overrides:
-  ceph:
-    conf:
-      global:
-        ms type: simple
-
 tasks:
   - cephfs_test_runner:
       fail_on_skip: false