From: Sage Weil <sage@redhat.com>
Date: Wed, 10 Jan 2018 18:26:56 +0000 (-0600)
Subject: ceph-disk/tests: simplify CEPH_LIB hack
X-Git-Tag: v13.0.2~78^2~72
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4683e40732f91b3e1f875ea18b509cbbf4afd93;p=ceph.git

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 73b09809709d..dcee7e14d6cc 100755
--- 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"