From 8ee62627203c46ffc6a29c5b8cbd93688413a195 Mon Sep 17 00:00:00 2001 From: Zhixiong Chi Date: Thu, 25 May 2023 20:41:41 +0800 Subject: [PATCH] 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 Change-Id: I84719699bdc245cc6f3c0eb6ee4b81544d35459d --- ceph/ceph/debian/deb_folder/ceph-base.install | 2 +- ceph/ceph/debian/deb_folder/rules | 4 ++-- ceph/ceph/files/stx-containerd-ceph-override.conf | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 ceph/ceph/files/stx-containerd-ceph-override.conf diff --git a/ceph/ceph/debian/deb_folder/ceph-base.install b/ceph/ceph/debian/deb_folder/ceph-base.install index 549058c0c..39525e835 100644 --- a/ceph/ceph/debian/deb_folder/ceph-base.install +++ b/ceph/ceph/debian/deb_folder/ceph-base.install @@ -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 diff --git a/ceph/ceph/debian/deb_folder/rules b/ceph/ceph/debian/deb_folder/rules index a4590e681..def4c4abb 100755 --- a/ceph/ceph/debian/deb_folder/rules +++ b/ceph/ceph/debian/deb_folder/rules @@ -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 diff --git a/ceph/ceph/files/stx-containerd-ceph-override.conf b/ceph/ceph/files/stx-containerd-ceph-override.conf new file mode 100644 index 000000000..5ffd85907 --- /dev/null +++ b/ceph/ceph/files/stx-containerd-ceph-override.conf @@ -0,0 +1,3 @@ +[Service] +ExecStopPost=/usr/sbin/ceph-preshutdown.sh +