]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ceph-disk: enable directory backed OSD at boot time 14602/head
authorLoic Dachary <ldachary@redhat.com>
Thu, 13 Apr 2017 21:49:50 +0000 (23:49 +0200)
committerAlexey Sheplyakov <asheplyakov@mirantis.com>
Tue, 18 Apr 2017 08:27:41 +0000 (12:27 +0400)
commit9b77b16b888b8efbf7d50d333e1880a6ec70d87a
tree20b5aafbd7ef4f82ca51b7495e82e1647c32dd65
parent7c006fc1640d2f6b9dc9002bfd994ecdf25510ee
ceph-disk: enable directory backed OSD at boot time

https://github.com/ceph/ceph/commit/539385b143feee3905dceaf7a8faaced42f2d3c6
introduced a regression preventing directory backed OSD from starting at
boot time.

For device backed OSD the boot sequence starts with ceph-disk@.service
and proceeds to

    systemctl enable --runtime ceph-osd@.service

where the --runtime ensure ceph-osd@12 is removed when the machine
reboots so that it does not compete with the ceph-disk@/dev/sdb1 unit at
boot time.

However directory backed OSD solely rely on the ceph-osd@.service unit
to start at boot time and will therefore fail to boot.

The --runtime flag is selectively set for device backed OSD only.

Fixes: http://tracker.ceph.com/issues/19628
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit f425a127b7487d2093c8c943f0bcdec3d673d601)

Conflicts:
src/ceph-disk/ceph_disk/main.py: trivial: Jewel does not support
   OpenRC and other inits, hence no corresponding 'elif'
src/ceph-disk/ceph_disk/main.py