From: Matan Breizman <mbreizma@redhat.com>
Date: Thu, 3 Mar 2022 10:23:48 +0000 (+0000)
Subject: Revert "doc/dev: Running workunits locally"
X-Git-Tag: v17.2.0~42^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79d529bee4c365af062dec8e5944cffbf49e206c;p=ceph.git

Revert "doc/dev: Running workunits locally"

This reverts commit 7324abbe0122e02d11c09be4ea0f3899abc16bbd.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 67570c9bb18023bf1b5af27fff46737ff3c93caf)
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 2573b364b9a9..7c305cf9642c 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1747,8 +1747,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"