This allows mgr/cephadm to run radosgw-admin.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
1ad8811d1b37ca5d46fd7ae807974e72c12d83a4)
Conflicts:
src/init-ceph.in
- Resolve conflicts.
ETCDIR=.
ASSUME_DEV=1
CEPH_LIB=$CEPH_ROOT/${BUILD_DIR}/lib
+ # mgr shells out to radosgw-admin; give it a proper path
+ export PATH=$BINDIR:$PATH
echo "$PYTHONPATH" | grep -q $CEPH_LIB || export PYTHONPATH=$CEPH_LIB/cython_modules/lib.3:$PYTHONPATH
echo "$LD_LIBRARY_PATH" | grep -q $CEPH_LIB || export LD_LIBRARY_PATH=$CEPH_LIB:$LD_LIBRARY_PATH
echo "$DYLD_LIBRARY_PATH" | grep -q $CEPH_LIB || export DYLD_LIBRARY_PATH=$CEPH_LIB:$DYLD_LIBRARY_PATH
prunb() {
debug quoted_print "$@" '&'
- "$@" &
+ PATH=$CEPH_BIN:$PATH "$@" &
}
prun() {
debug quoted_print "$@"
- "$@"
+ PATH=$CEPH_BIN:$PATH "$@"
}