summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Rhoden <trhoden@gmail.com>2012-08-20 13:29:11 -0700
committerSage Weil <sage@inktank.com>2012-12-28 12:12:23 -0800
commit8fef9360fe949fbf4ee6e468c36cc1c84b369b6e (patch)
treee3ae48fd3b6366fd12238c118bce47093a4cf63d
parentc34e38bcdc0460219d19b21ca7a0554adf7f7f84 (diff)
downloadceph-8fef9360fe949fbf4ee6e468c36cc1c84b369b6e.tar.gz
init-ceph: use SSH in "service ceph status -a" to get version
When running "service ceph status -a", a version number was never returned for remote hosts, only for the local. This was because the command to query the version number didn't use the do_cmd function, which is responsible for running the command over SSH when needed. Modify the ceph init.d script to use do_cmd for querying the Ceph version. Signed-off-by: Travis Rhoden <trhoden@gmail.com> (cherry picked from commit 60fdb6fda6233b01dae4ed8a34427d5960840b84)
-rw-r--r--src/init-ceph.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init-ceph.in b/src/init-ceph.in
index a8c5a29e8bd..31aeb287223 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -298,7 +298,7 @@ for name in $what; do
status)
if daemon_is_running $name ceph-$type $id $pid_file; then
get_conf asok "/var/run/ceph/ceph-$type.$id.asok" "admin socket"
- version=`$BINDIR/ceph --admin-daemon $asok version 2>/dev/null || echo unknown`
+ version=`do_cmd "$BINDIR/ceph --admin-daemon $asok version 2>/dev/null" || echo unknown`
echo "$name: running $version"
elif [ -e "$pid_file" ]; then
# daemon is dead, but pid file still exists