workunits/rbd: allow creating images in different formats

This will allow adding more arguments for testing combinations
of features in the future.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/qa/workunits/rbd/copy.sh b/qa/workunits/rbd/copy.sh
index 5d922920ad9a4b69c3bcab5c95404875fe68b9bb..933b735b786d5f9efcdea3834f93f5b5f5ecfb58 100755 (executable)
--- a/qa/workunits/rbd/copy.sh
+++ b/qa/workunits/rbd/copy.sh
@@ -17,7 +17,7 @@ dd if=/bin/ls of=/tmp/img1 bs=1k seek=10000
 dd if=/bin/ln of=/tmp/img1 bs=1k seek=100000
 
 # import, snapshot
-rbd import /tmp/img1 testimg1
+rbd import $RBD_CREATE_ARGS /tmp/img1 testimg1
 rbd resize testimg1 --size=256
 rbd export testimg1 /tmp/img2
 rbd snap create testimg1 --snap=snap1

diff --git a/qa/workunits/rbd/import_export.sh b/qa/workunits/rbd/import_export.sh
index a2af194b43a1e1825d40bffb79d7aabc99d84f7a..249ee448e3dddea7b26e38bce5816d56806951ed 100755 (executable)
--- a/qa/workunits/rbd/import_export.sh
+++ b/qa/workunits/rbd/import_export.sh
@@ -10,11 +10,11 @@ dd if=/bin/grep of=/tmp/img bs=1k seek=1000000
 
 rbd rm testimg || true
 
-rbd import /tmp/img testimg
+rbd import $RBD_CREATE_ARGS /tmp/img testimg
 rbd export testimg /tmp/img2
 
 cmp /tmp/img /tmp/img2
 
 rm /tmp/img /tmp/img2
 
-echo OK
\ No newline at end of file
+echo OK