X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Frecipes-extended%2Fceph%2Fceph-13.2.2%2F0005-Add-hooks-for-orderly-shutdown-on-controller.patch;fp=meta-stx%2Frecipes-extended%2Fceph%2Fceph-13.2.2%2F0005-Add-hooks-for-orderly-shutdown-on-controller.patch;h=0000000000000000000000000000000000000000;hb=062fafee2bd87f67b1e70425e27640598c2ccb7a;hp=fd53546283b4aa9b62904ead2f2db6ff2fc89021;hpb=9f7a49f0e6a98d4d24b6b8ed668325da0ae495ce;p=pti%2Frtp.git

diff --git a/meta-stx/recipes-extended/ceph/ceph-13.2.2/0005-Add-hooks-for-orderly-shutdown-on-controller.patch b/meta-stx/recipes-extended/ceph/ceph-13.2.2/0005-Add-hooks-for-orderly-shutdown-on-controller.patch
deleted file mode 100644
index fd53546..0000000
--- a/meta-stx/recipes-extended/ceph/ceph-13.2.2/0005-Add-hooks-for-orderly-shutdown-on-controller.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 1f882d7ee20d70548d380ce27eedab3ae30180d4 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Fri, 17 Apr 2020 00:55:52 +0800
-Subject: [PATCH] Add hooks for orderly shutdown on controller
-
-Hook the ceph init script to add systemd overrides to define
-an orderly shutdown for StarlingX controllers.
-
-Signed-off-by: Don Penney <don.penney@windriver.com>
----
- src/init-ceph.in | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
-diff --git a/src/init-ceph.in b/src/init-ceph.in
-index d13032a..a6113fa 100755
---- a/src/init-ceph.in
-+++ b/src/init-ceph.in
-@@ -434,6 +434,38 @@ for name in $what; do
- 		continue
- 	    fi
- 
-+            . /etc/platform/platform.conf
-+            if [ "${nodetype}" = "controller" ]; then
-+                # StarlingX: Hook the transient services launched by systemd-run
-+                # to allow for proper cleanup and orderly shutdown
-+
-+                # Set nullglob so wildcards will return empty string if no match
-+                shopt -s nullglob
-+
-+                OSD_SERVICES=$(for svc in /run/systemd/system/ceph-osd*.service; do basename $svc; done | xargs echo)
-+                for d in /run/systemd/system/ceph-osd*.d; do
-+                    cat <<EOF > $d/starlingx-overrides.conf
-+[Unit]
-+Before=docker.service
-+After=sm-shutdown.service
-+
-+EOF
-+                done
-+
-+                for d in /run/systemd/system/ceph-mon*.d; do
-+                    cat <<EOF > $d/starlingx-overrides.conf
-+[Unit]
-+Before=docker.service
-+After=sm-shutdown.service ${OSD_SERVICES}
-+
-+EOF
-+                done
-+
-+                shopt -u nullglob
-+
-+                systemctl daemon-reload
-+            fi
-+
- 	    [ -n "$post_start" ] && do_cmd "$post_start"
- 	    [ -n "$lockfile" ] && [ "$?" -eq 0 ] && touch $lockfile
- 	    ;;
--- 
-2.7.4
-