Browse code

File based config capaliblity for etcd.

Change-Id: I14204e1f53385a211a111b6cb343fe3926ed8aa6
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3645
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Vinay Kulkarni authored on 2017/08/28 09:39:53
Showing 2 changed files
... ...
@@ -5,7 +5,7 @@ After=network.target
5 5
 [Service]
6 6
 Type=notify
7 7
 WorkingDirectory=/var/lib/etcd/
8
-ExecStart=/bin/bash -c "/usr/bin/etcd"
8
+ExecStart=/usr/bin/etcd --config-file /etc/etcd/etcd-default-conf.yml
9 9
 Restart=on-failure
10 10
 LimitNOFILE=65536
11 11
 
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Etcd-3.1.5
2 2
 Name:           etcd
3 3
 Version:        3.1.5
4
-Release:        2%{?dist}
4
+Release:        3%{?dist}
5 5
 License:        Apache License
6 6
 URL:            https://github.com/coreos/etcd
7 7
 Group:          System Environment/Security
... ...
@@ -26,6 +26,8 @@ A highly-available key value store for shared configuration and service discover
26 26
 install -vdm755 %{buildroot}%{_bindir}
27 27
 install -vdm755 %{buildroot}/%{_docdir}/%{name}-%{version}
28 28
 install -vdm755 %{buildroot}/lib/systemd/system
29
+install -vdm 0755 %{buildroot}%{_sysconfdir}/etcd
30
+install -vpm 0755 -T etcd.conf.yml.sample %{buildroot}%{_sysconfdir}/etcd/etcd-default-conf.yml
29 31
 
30 32
 chown -R root:root %{buildroot}%{_bindir}
31 33
 chown -R root:root %{buildroot}/%{_docdir}/%{name}-%{version}
... ...
@@ -55,8 +57,11 @@ rm -rf %{buildroot}/*
55 55
 /lib/systemd/system/etcd.service
56 56
 /lib/systemd/system-preset/50-etcd.preset
57 57
 %dir /var/lib/etcd
58
+%config(noreplace) %{_sysconfdir}/etcd/etcd-default-conf.yml
58 59
 
59 60
 %changelog
61
+*   Sun Aug 27 2017 Vinay Kulkarni <kulkarniv@vmware.com> 3.1.5-3
62
+-   File based configuration for etcd service.
60 63
 *   Wed May 31 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.1.5-2
61 64
 -   Provide preset file to disable service by default
62 65
 *   Thu Apr 06 2017 Anish Swaminathan <anishs@vmware.com> 3.1.5-1