ceph-disk/tests: simplify CEPH_LIB hack

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/ceph-disk/tests/ceph-disk.sh b/src/ceph-disk/tests/ceph-disk.sh
index 73b09809709d0007819076caf213806929a7b58d..dcee7e14d6cca301bd79276588c4214ba7430b28 100755 (executable)
--- a/src/ceph-disk/tests/ceph-disk.sh
+++ b/src/ceph-disk/tests/ceph-disk.sh
@@ -27,6 +27,8 @@ if [ -z "$CEPH_ROOT" ] || [ -z "$CEPH_BIN" ] || [ -z "$CEPH_LIB" ]; then
 fi
 source $CEPH_ROOT/qa/standalone/ceph-helpers.sh
 
+export $CEPH_LIB
+
 set -x
 
 PS4='${BASH_SOURCE[0]}:$LINENO: ${FUNCNAME[0]}:  '
@@ -441,11 +443,8 @@ function run() {
     CEPH_ARGS+=" --mon-host=$CEPH_MON"
     CEPH_ARGS+=" --chdir="
     CEPH_ARGS+=" --journal-dio=false"
-    CEPH_ARGS+=" --erasure-code-dir=$CEPH_LIB"
-    CEPH_ARGS+=" --plugin-dir=$CEPH_LIB"
     CEPH_ARGS+=" --log-file=$dir/\$name.log"
     CEPH_ARGS+=" --pid-file=$dir/\$name.pidfile"
-    CEPH_ARGS+=" --osd-class-dir=$CEPH_LIB"
     CEPH_ARGS+=" --run-dir=$dir"
     CEPH_ARGS+=" --osd-failsafe-full-ratio=.99"
     CEPH_ARGS+=" --osd-journal-size=100"