Skip to content

Commit

Permalink
Merge pull request #10435 from ceph/wip-debian-rbdmap-service
Browse files Browse the repository at this point in the history
debian: replace SysV rbdmap with systemd service

Reviewed-by: Kefu Chai <kchai@redhat.com>
  • Loading branch information
tchaikov committed Aug 21, 2016
2 parents 3be1d4d + 8398071 commit fe992d6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion debian/ceph-common.install
Expand Up @@ -34,7 +34,6 @@ usr/share/ceph/known_hosts_drop.ceph.com
usr/share/ceph/id_dsa_drop.ceph.com
usr/share/ceph/id_dsa_drop.ceph.com.pub
etc/ceph/rbdmap
etc/init.d/rbdmap
lib/udev/rules.d/50-rbd.rules
usr/lib/python*/dist-packages/ceph_argparse.py*
usr/lib/python*/dist-packages/ceph_daemon.py*
2 changes: 1 addition & 1 deletion debian/rules
Expand Up @@ -39,7 +39,6 @@ override_dh_auto_install:
install -D -m 644 udev/95-ceph-osd.rules $(DESTDIR)/lib/udev/rules.d/95-ceph-osd.rules
install -D -m 644 udev/60-ceph-by-parttypeuuid.rules $(DESTDIR)/lib/udev/rules.d/60-ceph-by-parttypeuuid.rules
install -D -m 644 src/etc-rbdmap $(DESTDIR)/etc/ceph/rbdmap
install -D -m 755 src/init-rbdmap $(DESTDIR)/etc/init.d/rbdmap

# doc/changelog is a directory, which confuses dh_installchangelogs
override_dh_installchangelogs:
Expand Down Expand Up @@ -85,6 +84,7 @@ override_dh_installinit:
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
Expand Down

0 comments on commit fe992d6

Please sign in to comment.