]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
debian: replace SysV rbdmap with systemd service 14383/head
authorKen Dreyer <kdreyer@redhat.com>
Tue, 16 Feb 2016 19:56:34 +0000 (12:56 -0700)
committerNathan Cutler <ncutler@suse.com>
Fri, 7 Apr 2017 06:40:56 +0000 (08:40 +0200)
Stop shipping /etc/init.d/rbdmap in the Debian packages. Ship the
rbdmap.service systemd unit file instead.

The corresponding change has already been made for RPMs, in
9224ac2ad25f7d017916f58b642c0ea25305c3e5.

For Upstart-based systems (eg Ubuntu Trusty), the Debian packages
already contain rbdmap.conf.

(This gets us a tiny bit closer to being able to remove the rbdmap SysV
script from our tree entirely.)

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 839807118dda2fb4d57ed9d50ec46e3ee0e2820a)

Conflicts:
    debian/ceph-common.install (retain /etc/init.d/rbdmap so jewel users can choose sysvinit or systemd)
    debian/rules (retain /etc/init.d/rbdmap so jewel users can choose sysvinit or systemd)

debian/rules

index 14aab2edcafe2f8eca1ea9cc01013139b5d1eb3c..cd73c878968846b30b7f5d94e9a3431089a85330 100755 (executable)
@@ -151,6 +151,7 @@ binary-arch: build install
        install -m0644 systemd/ceph-create-keys@.service debian/ceph-base/lib/systemd/system
        install -m0644 systemd/ceph-osd@.service debian/ceph-osd/lib/systemd/system
        install -m0644 systemd/ceph-disk@.service debian/ceph-osd/lib/systemd/system
+       install -m0644 systemd/rbdmap.service debian/ceph-common/lib/systemd/system
        sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-mon/lib/systemd/system/ceph-mon@.service
        sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-base/lib/systemd/system/ceph-create-keys@.service
        sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-osd/lib/systemd/system/ceph-osd@.service