X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fstx-puppet%2F0007-puppet-manifests-etcd-override-typo-and-journalctl.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fstx-puppet%2F0007-puppet-manifests-etcd-override-typo-and-journalctl.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=074e115840fec682ae1e40331c90ff93162690d8;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

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
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
-