Revert "Revert "oran-shell-release: release image for F""
[pti/rtp.git] / meta-starlingx / meta-stx-cloud / recipes-support / puppet / files / stx-puppet / 0007-puppet-manifests-etcd-override-typo-and-journalctl.patch
1 From 804d05b0e188b8e694def2abcd0d9b0979b40b6f Mon Sep 17 00:00:00 2001
2 From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
3 Date: Tue, 7 Jan 2020 16:08:24 -0800
4 Subject: [PATCH] puppet-manifests:etcd-override typo and journalctl
5
6 ---
7  .../src/modules/platform/files/etcd-override.conf             | 4 ++--
8  1 file changed, 2 insertions(+), 2 deletions(-)
9
10 diff --git a/puppet-manifests/src/modules/platform/files/etcd-override.conf b/puppet-manifests/src/modules/platform/files/etcd-override.conf
11 index 09d2ed47..5860aab4 100644
12 --- a/puppet-manifests/src/modules/platform/files/etcd-override.conf
13 +++ b/puppet-manifests/src/modules/platform/files/etcd-override.conf
14 @@ -4,6 +4,6 @@ User=root
15  NotifyAccess=all
16  Type=notify
17  ExecStart=
18 -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"
19 +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"
20  ExecStartPost=/bin/bash -c 'echo $MAINPID >/var/run/etcd.pid'
21 -ExecStopPost=/bin/bash/rm -f /var/run/etcd.pid
22 +ExecStopPost=/bin/bash -c 'rm -f /var/run/etcd.pid'
23 -- 
24 2.23.0
25