]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
ceph-disk-activate: identify cluster .conf by fsid
authorSage Weil <sage@inktank.com>
Fri, 15 Mar 2013 04:05:07 +0000 (21:05 -0700)
committerSage Weil <sage@inktank.com>
Fri, 15 Mar 2013 04:05:07 +0000 (21:05 -0700)
commit80af5fb887f30792c342ac16da9ed95d7e89e491
tree4763d040eee7981b9e35cca80cd36f6a3731606d
parent7370b5564606474f11b9ac5afb7cc60e0ac36ed1
ceph-disk-activate: identify cluster .conf by fsid

Determine what cluster the disk belongs to by checking the fsid defined
in /etc/ceph/*.conf.  Previously we hard-coded 'ceph'.

Note that this has the nice side-effect that if we have a disk with a
bad/different fsid, we now fail to activate it.  Previously, we would
mount and start ceph-osd, but the daemon would fail to authenticate
because it was part of the wrong cluster.

Fixes: #3253
Signed-off-by: Sage Weil <sage@inktank.com>
src/ceph-disk-activate