qa: update cephtool EC pools test to respect IDs

...of data and metadata pools which are no longer
constant.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index e62388091e693f25837fecdf3f81e3a24bc5eb46..5eeb6304ba5a0455b1e0c5e5e336be1bf6e71a92 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -360,13 +360,18 @@ function test_mon_mds()
   ceph mds add_data_pool mds-ec-pool 2>$TMPFILE
   check_response 'erasure-code' $? 22
   set -e
-  poolnum=$(ceph osd dump | grep 'pool.*mds-ec-pool' | awk '{print $2;}')
+  ec_poolnum=$(ceph osd dump | grep 'pool.*mds-ec-pool' | awk '{print $2;}')
+  data_poolnum=$(ceph osd dump | grep 'pool.*fs_data' | awk '{print $2;}')
+  metadata_poolnum=$(ceph osd dump | grep 'pool.*fs_metadata' | awk '{print $2;}')
   set +e
-  ceph mds newfs 0 $poolnum --yes-i-really-mean-it 2>$TMPFILE
+
+  ceph fs rm default --yes-i-really-mean-it
+
+  ceph mds newfs $metadata_poolnum $ec_poolnum --yes-i-really-mean-it 2>$TMPFILE
   check_response 'erasure-code' $? 22
-  ceph mds newfs $poolnum 1 --yes-i-really-mean-it 2>$TMPFILE
+  ceph mds newfs $ec_poolnum $data_poolnum --yes-i-really-mean-it 2>$TMPFILE
   check_response 'erasure-code' $? 22
-  ceph mds newfs $poolnum $poolnum --yes-i-really-mean-it 2>$TMPFILE
+  ceph mds newfs $ec_poolnum $ec_poolnum --yes-i-really-mean-it 2>$TMPFILE
   check_response 'erasure-code' $? 22
   ceph fs new cephfs fs_metadata mds-ec-pool 2>$TMPFILE
   check_response 'erasure-code' $? 22
@@ -384,7 +389,6 @@ function test_mon_mds()
   # ceph mds set_state
   # ceph mds stop
 
-  ceph fs rm default --yes-i-really-mean-it
   ceph osd pool delete fs_data fs_data --yes-i-really-really-mean-it
   ceph osd pool delete fs_metadata fs_metadata --yes-i-really-really-mean-it
 }