X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-virt%2Frecipes-extended%2Fceph%2Fceph-14.1.0%2F0001-ceph-rebase-on-stx.3.0-and-warrior.patch;fp=meta-starlingx%2Fmeta-stx-virt%2Frecipes-extended%2Fceph%2Fceph-14.1.0%2F0001-ceph-rebase-on-stx.3.0-and-warrior.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=d27ed87b705b766ce3c559844219821bb6308157;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-14.1.0/0001-ceph-rebase-on-stx.3.0-and-warrior.patch b/meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-14.1.0/0001-ceph-rebase-on-stx.3.0-and-warrior.patch
deleted file mode 100644
index d27ed87..0000000
--- a/meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-14.1.0/0001-ceph-rebase-on-stx.3.0-and-warrior.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 3763a20314ec2b80ec9d8525a1d3867b3c731266 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Sat, 22 Feb 2020 04:48:04 -0800
-Subject: [PATCH] ceph rebase on stx.3.0 and warrior
-
-From 03340eaf0004e3cc8e3f8991ea96a46757d92830 Mon Sep 17 00:00:00 2001
-From: Don Penney <don.penney@windriver.com>
-Date: Sat, 26 Jan 2019 13:34:55 -0500
-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.
----
- src/init-ceph.in | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
-diff --git a/src/init-ceph.in b/src/init-ceph.in
-index 1843710..a31b900 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.23.0
-