meta-starlingx: remove the upstream layer

[pti/rtp.git] / meta-starlingx / meta-stx-cloud / recipes-support / puppet / files / stx-puppet / 0007-puppet-manifests-etcd-override-typo-and-journalctl.patch

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0007-puppet-manifests-etcd-override-typo-and-journalctl.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0007-puppet-manifests-etcd-override-typo-and-journalctl.patch
deleted file mode 100644 (file)
index 074e115..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0007-puppet-manifests-etcd-override-typo-and-journalctl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 804d05b0e188b8e694def2abcd0d9b0979b40b6f Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Tue, 7 Jan 2020 16:08:24 -0800
-Subject: [PATCH] puppet-manifests:etcd-override typo and journalctl
-
----
- .../src/modules/platform/files/etcd-override.conf             | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/puppet-manifests/src/modules/platform/files/etcd-override.conf b/puppet-manifests/src/modules/platform/files/etcd-override.conf
-index 09d2ed47..5860aab4 100644
---- a/puppet-manifests/src/modules/platform/files/etcd-override.conf
-+++ b/puppet-manifests/src/modules/platform/files/etcd-override.conf
-@@ -4,6 +4,6 @@ User=root
- NotifyAccess=all
- Type=notify
- ExecStart=
--ExecStart=-/bin/bash -c "GOMAXPROCS=$(nproc) /usr/bin/etcd --name=\"${ETCD_NAME}\" --data-dir=\"${ETCD_DATA_DIR}\" --listen-client-urls=\"${ETCD_LISTEN_CLIENT_URLS}\" 2>&1 | /usr/bin/forward-journald -tag etcd"
-+ExecStart=-/bin/bash -c "GOMAXPROCS=$(nproc) /usr/bin/etcd --name=\"${ETCD_NAME}\" --data-dir=\"${ETCD_DATA_DIR}\" --listen-client-urls=\"${ETCD_LISTEN_CLIENT_URLS}\" 2>&1"
- ExecStartPost=/bin/bash -c 'echo $MAINPID >/var/run/etcd.pid'
--ExecStopPost=/bin/bash/rm -f /var/run/etcd.pid
-+ExecStopPost=/bin/bash -c 'rm -f /var/run/etcd.pid'
--- 
-2.23.0
-