From 5a7c564222f1061bff42bd8771e05ba1e97f88bbef0bff6ec857ede588636f43 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Fri, 29 Apr 2022 11:42:57 +0000 Subject: [PATCH] Accepting request 973730 from home:ojkastl_buildservice:Branch_devel_kubic add ETCD_OPTIONS to systemd unit file and configuration file, to allow the user to easily set things like '--enable-v2=true' OBS-URL: https://build.opensuse.org/request/show/973730 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/etcd?expand=0&rev=21 --- etcd.changes | 6 ++++++ etcd.conf | 4 ++++ etcd.service | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/etcd.changes b/etcd.changes index 63f5ba9..7682962 100644 --- a/etcd.changes +++ b/etcd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 28 13:35:37 UTC 2022 - Johannes Kastl + +- add variable ETCD_OPTIONS to both service unit and configuration file + this allows the user to easily add things like "--enable-v2=true" + ------------------------------------------------------------------- Wed Apr 20 13:18:23 UTC 2022 - eroca@suse.com diff --git a/etcd.conf b/etcd.conf index fce46a7..a5047be 100644 --- a/etcd.conf +++ b/etcd.conf @@ -1,3 +1,7 @@ +# set commandline options +# example: ETCD_OPTIONS="--enable-v2=true" to enable the v2 API +#ETCD_OPTIONS= + # [member] ETCD_NAME=default ETCD_DATA_DIR="/var/lib/etcd/default.etcd" diff --git a/etcd.service b/etcd.service index 8fd8d6a..8a39192 100644 --- a/etcd.service +++ b/etcd.service @@ -23,7 +23,7 @@ WorkingDirectory=/var/lib/etcd/ EnvironmentFile=-/etc/sysconfig/etcd User=etcd # set GOMAXPROCS to number of processors -ExecStart=/bin/bash -c "GOMAXPROCS=$(nproc) /usr/sbin/etcd" +ExecStart=/bin/bash -c "GOMAXPROCS=$(nproc) /usr/sbin/etcd $ETCD_OPTIONS" Restart=on-failure LimitNOFILE=65536 Nice=-10