ceph_common.sh: add mgr support to init-ceph

This is mainly for the benefit of vstart.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/ceph_common.sh b/src/ceph_common.sh
index 69e9b066e8cb3b49be33e408ff206f8fcea49461..20a2db04c4be9695222230bc22d9ca8c7a25649f 100644 (file)
--- a/src/ceph_common.sh
+++ b/src/ceph_common.sh
@@ -175,14 +175,16 @@ get_local_name_list() {
     get_local_daemon_list "mon"
     get_local_daemon_list "osd"
     get_local_daemon_list "mds"
+    get_local_daemon_list "mgr"
 }
 
 get_name_list() {
     orig="$*"
 
-    # extract list of monitors, mdss, osds defined in startup.conf
+    # extract list of monitors, mdss, osds, mgrs defined in startup.conf
     allconf="$local "`$CCONF -c $conf -l mon | egrep -v '^mon$' || true ; \
        $CCONF -c $conf -l mds | egrep -v '^mds$' || true ; \
+       $CCONF -c $conf -l mgr | egrep -v '^mgr$' || true ; \
        $CCONF -c $conf -l osd | egrep -v '^osd$' || true`
 
     if [ -z "$orig" ]; then
@@ -195,7 +197,7 @@ get_name_list() {
        type=`echo $f | cut -c 1-3`   # e.g. 'mon', if $item is 'mon1'
        id=`echo $f | cut -c 4- | sed 's/\\.//'`
        case $f in
-           mon | osd | mds)
+           mon | osd | mds | mgr)
                for d in $allconf; do
                    if echo $d | grep -q ^$type; then
                        what="$what $d"