]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "doc/dev: Running workunits locally" 45244/head
authorMatan Breizman <mbreizma@redhat.com>
Thu, 3 Mar 2022 10:23:48 +0000 (10:23 +0000)
committerMatan Breizman <mbreizma@redhat.com>
Thu, 3 Mar 2022 20:31:34 +0000 (20:31 +0000)
This reverts commit 7324abbe0122e02d11c09be4ea0f3899abc16bbd.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
src/vstart.sh

index 5a58135278de7c50799b83bb8b538eeba7767bc5..cdfcbf740de11629d2d581b21cea3d7a6f88f60e 100755 (executable)
@@ -1758,8 +1758,11 @@ echo ""
     echo "export PYTHONPATH=$PYBIND:$CYTHON_PYTHONPATH:$CEPH_PYTHON_COMMON\$PYTHONPATH"
     echo "export LD_LIBRARY_PATH=$CEPH_LIB:\$LD_LIBRARY_PATH"
     echo "export PATH=$CEPH_DIR/bin:\$PATH"
-    echo "export CEPH_CONF=$conf_fn"
-    echo "export CEPH_KEYRING=$keyring_fn"
+
+    if [ "$CEPH_DIR" != "$PWD" ]; then
+        echo "export CEPH_CONF=$conf_fn"
+        echo "export CEPH_KEYRING=$keyring_fn"
+    fi
 
     if [ -n "$CEPHFS_SHELL" ]; then
         echo "alias cephfs-shell=$CEPHFS_SHELL"