From: Noah Watkins <nwatkins@redhat.com>
Date: Fri, 17 Aug 2018 22:21:57 +0000 (-0700)
Subject: qa/standalone/ceph-helpers.sh: fix mgr module path
X-Git-Tag: v12.2.13~18^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3baebbea2c56aa27db6078c4780f4067c9f32d44;p=ceph.git

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)

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

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index 3a1d392bbe7a..0c705ec0d37e 100755
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -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
 }