import quincy beta 17.1.0

[ceph.git] / ceph / qa / tasks / ceph.py

diff --git a/ceph/qa/tasks/ceph.py b/ceph/qa/tasks/ceph.py
index a6eab9be808a2fd7fab4619f56bf99470045a027..db86d6d53cc467a877533dd0b33fe4a98463aeca 100644 (file)
--- a/ceph/qa/tasks/ceph.py
+++ b/ceph/qa/tasks/ceph.py
@@ -429,7 +429,6 @@ def cephfs_setup(ctx, config):
         log.info('Setting up CephFS filesystem(s)...')
         cephfs_config = config.get('cephfs', {})
         fs_configs =  cephfs_config.pop('fs', [{'name': 'cephfs'}])
-        set_allow_multifs = len(fs_configs) > 1
 
         # wait for standbys to become available (slow due to valgrind, perhaps)
         mdsc = MDSCluster(ctx)
@@ -446,9 +445,6 @@ def cephfs_setup(ctx, config):
             temp = deepcopy(cephfs_config)
             teuthology.deep_merge(temp, fs_config)
             fs = Filesystem(ctx, fs_config=temp, name=name, create=True)
-            if set_allow_multifs:
-                fs.set_allow_multifs()
-                set_allow_multifs = False
             fss.append(fs)
 
         yield