mirror of
https://github.com/ceph/ceph
synced 2024-12-17 08:57:28 +00:00
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>
This commit is contained in:
parent
fdde99e15f
commit
b2ec3377ae
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user