Skip to content

Commit

Permalink
init-ceph.in: skip ceph-disk if it is not present
Browse files Browse the repository at this point in the history
With the ceph-mon vs ceph-osd split packaging, users are expected to
have the ceph-mon package installed and not ceph-osd (and vice versa).
However, the init script (/etc/init.d/ceph) has a call to `ceph-disk`,
which may not be present on the machine.

Given that our packaging is not yet split upstream, this bug does not
manifest itself currently, because both ceph-mon and ceph-disk are
currently in the same "ceph" package. Once we split the packaging,
though, this will become an issue.

http://tracker.ceph.com/issues/10587 Refs: #10587
  • Loading branch information
ktdreyer committed Jan 19, 2016
1 parent dda9a08 commit 89bed4f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/init-ceph.in
Expand Up @@ -533,7 +533,9 @@ done
# activate latent osds?
if [ "$command" = "start" -a "$BINDIR" != "." ]; then
if [ "$*" = "" ] || echo $* | grep -q ^osd\$ ; then
ceph-disk activate-all
if [ -x $SBINDIR/ceph-disk ]; then
ceph-disk activate-all
fi
fi
fi

Expand Down

0 comments on commit 89bed4f

Please sign in to comment.