From 88c7af275633a98912f81d16adfcf15849112bd7 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 20 Jun 2023 13:46:01 -0400 Subject: [PATCH] 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 --- src/vstart.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vstart.sh b/src/vstart.sh index f38e703cdc302..8bca100547c08 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 -- 2.39.5