]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart.sh: fix compressor_dir path 9605/head
authorSage Weil <sage@redhat.com>
Wed, 15 Jun 2016 20:41:57 +0000 (16:41 -0400)
committerSage Weil <sage@redhat.com>
Wed, 15 Jun 2016 20:42:32 +0000 (16:42 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/vstart.sh

index 11add177d6e9bef56709ca3aac1b828e74f307de..c18b73265d49c6bcc6c012571224d1e6e07839f1 100755 (executable)
@@ -33,7 +33,6 @@ if [ -n "$CEPH_BUILD_ROOT" ]; then
         [ -z "$CEPH_BIN" ] && CEPH_BIN=$CEPH_BUILD_ROOT/bin
         [ -z "$CEPH_LIB" ] && CEPH_LIB=$CEPH_BUILD_ROOT/lib
         [ -z "$EC_PATH" ] && EC_PATH=$CEPH_LIB/erasure-code
-        [ -z "$CS_PATH" ] && CS_PATH=$CEPH_LIB/compressor
         [ -z "$OBJCLASS_PATH" ] && OBJCLASS_PATH=$CEPH_LIB/rados-classes
 elif [ -n "$CEPH_ROOT" ]; then
         [ -z "$PYBIND" ] && PYBIND=$CEPH_ROOT/src/pybind
@@ -43,12 +42,10 @@ elif [ -n "$CEPH_ROOT" ]; then
         [ -z "$CEPH_LIB" ] && CEPH_LIB=$CEPH_BUILD_DIR/lib
         [ -z "$OBJCLASS_PATH" ] && OBJCLASS_PATH=$CEPH_LIB
         [ -z "$EC_PATH" ] && EC_PATH=$CEPH_LIB
-        [ -z "$CS_PATH" ] && CS_PATH=$CEPH_LIB
 else
         [ -z "$CEPH_BIN" ] && CEPH_BIN=.
         [ -z "$CEPH_LIB" ] && CEPH_LIB=.libs
         [ -z "$EC_PATH" ] && EC_PATH=$CEPH_LIB
-        [ -z "$CS_PATH" ] && CS_PATH=$CEPH_LIB
         [ -z "$OBJCLASS_PATH" ] && OBJCLASS_PATH=$CEPH_LIB
 fi
 
@@ -469,7 +466,7 @@ if [ "$start_mon" -eq 1 ]; then
         mon data avail warn = 10
         mon data avail crit = 1
         erasure code dir = $EC_PATH
-        plugin dir = $CS_PATH
+        plugin dir = $CEPH_LIB
         osd pool default erasure code profile = plugin=jerasure technique=reed_sol_van k=2 m=1 ruleset-failure-domain=osd
         rgw frontends = fastcgi, civetweb port=$CEPH_RGW_PORT
         rgw dns name = localhost