From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 20 Jun 2023 17:46:01 +0000 (-0400)
Subject: vstart.sh: always add CEPH_CONF to vstart_environment.sh
X-Git-Tag: v19.0.0~760^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88c7af275633a98912f81d16adfcf15849112bd7;p=ceph.git

vstart.sh: always add CEPH_CONF to vstart_environment.sh

This makes sourcing this for e.g. vstart_runner.py actually useful.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index f38e703cdc3..8bca100547c 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1888,9 +1888,9 @@ 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"
+    # We cannot set CEPH_KEYRING if this is sourced by vstart_runner.py (API tests)
     if [ "$CEPH_DIR" != "$PWD" ]; then
-        echo "export CEPH_CONF=$conf_fn"
         echo "export CEPH_KEYRING=$keyring_fn"
     fi