qa: clean up and simplify client 2 caps

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>

diff --git a/qa/tasks/cephfs/test_multifs_auth.py b/qa/tasks/cephfs/test_multifs_auth.py
index cbce406586821fbc38dfb1f7d5408ec02884680b..b6408413f456553a4a2ef8e15e8ca45450c7baad 100644 (file)
--- a/qa/tasks/cephfs/test_multifs_auth.py
+++ b/qa/tasks/cephfs/test_multifs_auth.py
@@ -32,9 +32,10 @@ class TestMultiFS(CephFSTestCase):
         self.fs2 = self.mds_cluster.newfs(name='cephfs2', create=True)
 
         # we'll reassign caps to client.1 so that it can operate with cephfs2
-        self.run_ceph_cmd(f'auth caps client.{self.mount_b.client_id} mon '
-                          f'"allow r" osd "allow rw '
-                          f'pool={self.fs2.get_data_pool_name()}" mds allow')
+        self.run_ceph_cmd(f'auth caps client.{self.mount_b.client_id}'
+                           ' mon "allow r"'
+                          f' osd "allow rw tag cephfs data={self.fs2.name}"'
+                           ' mds "allow"')
         self.mount_b.remount(cephfs_name=self.fs2.name)