diff --git a/scripts/gen_rbd.sh b/scripts/gen_rbd.sh deleted file mode 100755 index 07fdbd1e7..000000000 --- a/scripts/gen_rbd.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -e - -if ! hash ceph &> /dev/null; then - exit 0 -fi - -echo -echo "[Ceph]" -echo " Ceph $RBD_POOL $RBD_NAME 512" diff --git a/test/bdev/blockdev.sh b/test/bdev/blockdev.sh index a310ed9da..ac301bb0d 100755 --- a/test/bdev/blockdev.sh +++ b/test/bdev/blockdev.sh @@ -144,7 +144,7 @@ function setup_rbd_conf() { rbd_setup 127.0.0.1 timing_exit rbd_setup - $rootdir/scripts/gen_rbd.sh >> $conf_file + "$rpc_py" bdev_rbd_create -b Ceph0 rbd foo 512 } function bdev_bounds() { @@ -351,7 +351,7 @@ case "$test_type" in pmem ) start_spdk_tgt; setup_pmem_conf;; rbd ) - setup_rbd_conf;; + start_spdk_tgt; setup_rbd_conf;; * ) echo "invalid test name" exit 1