]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/standalone/ceph-helpers.sh: fix mgr module path
authorNoah Watkins <nwatkins@redhat.com>
Fri, 17 Aug 2018 22:21:57 +0000 (15:21 -0700)
committerDavid Zafman <dzafman@redhat.com>
Wed, 4 Dec 2019 19:02:43 +0000 (11:02 -0800)
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)

Conflicts:
qa/run-standalone.sh (No get_python_path() to modify)

qa/standalone/ceph-helpers.sh

index 3a1d392bbe7a448f3c4985bfe019703cc3104347..0c705ec0d37ecb510354b26e37adcd438dee4896 100755 (executable)
@@ -563,6 +563,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
 }