qa/standalone/ceph-helpers.sh: fix mgr module path

callers of get_python_path were not passing in a $1 parameter, so
ceph_lib was an empty string resulting in an invalid path to the built
cython modules. assume this is called from the `lib` parent directory.

pass path to the manager modules when starting ceph-mgr.

Signed-off-by: Noah Watkins <nwatkins@redhat.com>
(cherry picked from commit 7d3fa9bda3b0160c872e388c9f75cd1cabf9d4b5)

diff --git a/qa/run-standalone.sh b/qa/run-standalone.sh
index 039cb3bcc23d6913b76fc7038043473e59427595..e9978c1d8bcfb9ff770b34959bb2aa6acac8429f 100755 (executable)
--- a/qa/run-standalone.sh
+++ b/qa/run-standalone.sh
@@ -18,8 +18,6 @@ function get_cmake_variable() {
 }
 
 function get_python_path() {
-    local ceph_lib=$1
-    shift
     local py_ver=$(get_cmake_variable MGR_PYTHON_VERSION | cut -d '.' -f1)
     if [ -z "${py_ver}" ]; then
         if [ $(get_cmake_variable WITH_PYTHON2) = ON ]; then
@@ -28,7 +26,7 @@ function get_python_path() {
             py_ver=3
         fi
     fi
-    echo $(realpath ../src/pybind):$ceph_lib/cython_modules/lib.$py_ver
+    echo $(realpath ../src/pybind):$(pwd)/lib/cython_modules/lib.$py_ver
 }
 
 if [ `uname` = FreeBSD ]; then

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index 293ae280f611e4afd8736e720ecebc0d26bd9be0..8def1c0bf011d2a7b3b71670031120092652a4d9 100755 (executable)
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -560,6 +560,7 @@ function run_mgr() {
         --admin-socket=$(get_asok_path) \
         --run-dir=$dir \
         --pid-file=$dir/\$name.pid \
+        --mgr-module-path=$(realpath ${CEPH_ROOT}/src/pybind/mgr) \
         "$@" || return 1
 }