ceph: Adjust the override config file to the containerd runtime
As the current ceph depends on the containerd docker runtime, so we move the original config file from docker service to containerd. Make sure the correct dependency order and avoid the failure to shutdown. Meanwhile rename the config script to make it more clearer. TestPlan: PASS: build-pkgs -a PASS: build-image PASS: Jenkins Installation PASS: Run the testcase pods PASS: shutdown -hP now Closes-Bug: 2020610 Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> Change-Id: I84719699bdc245cc6f3c0eb6ee4b81544d35459d
This commit is contained in:
parent
d52137d9c7
commit
8ee6262720
|
@ -30,7 +30,7 @@ etc/ceph/ceph-mds.conf.pmon
|
|||
etc/ceph/ceph.conf
|
||||
etc/services.d/*
|
||||
usr/sbin/ceph-preshutdown.sh
|
||||
lib/systemd/system/docker.service.d/starlingx-docker-override.conf
|
||||
lib/systemd/system/containerd.service.d/stx-containerd-ceph-override.conf
|
||||
lib/systemd/system/ceph.service
|
||||
lib/systemd/system/mgr-restful-plugin.service
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ SOURCE7 := ceph-manage-journal.py
|
|||
SOURCE8 := ceph.service
|
||||
SOURCE9 := mgr-restful-plugin.service
|
||||
SOURCE10 := ceph-preshutdown.sh
|
||||
SOURCE11 := starlingx-docker-override.conf
|
||||
SOURCE11 := stx-containerd-ceph-override.conf
|
||||
|
||||
|
||||
# Paths
|
||||
|
@ -197,7 +197,7 @@ override_dh_auto_install:
|
|||
install -D -m 644 ${SOURCE8} $(DESTDIR)/${UNITDIR}/ceph.service
|
||||
install -D -m 644 ${SOURCE9} $(DESTDIR)/${UNITDIR}/mgr-restful-plugin.service
|
||||
install -D -m 700 ${SOURCE10} $(DESTDIR)/${SBINDIR}/ceph-preshutdown.sh
|
||||
install -D -m 644 ${SOURCE11} $(DESTDIR)/${UNITDIR}/docker.service.d/starlingx-docker-override.conf
|
||||
install -D -m 644 ${SOURCE11} $(DESTDIR)/${UNITDIR}/containerd.service.d/stx-containerd-ceph-override.conf
|
||||
install -m 750 src/init-radosgw $(DESTDIR)/${INITDIR}/ceph-radosgw
|
||||
sed -i '/### END INIT INFO/a SYSTEMCTL_SKIP_REDIRECT=1' $(DESTDIR)/${INITDIR}/ceph-radosgw
|
||||
install -m 750 src/init-rbdmap $(DESTDIR)/${INITDIR}/rbdmap
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
[Service]
|
||||
ExecStopPost=/usr/sbin/ceph-preshutdown.sh
|
||||
|
Loading…
Reference in New Issue