summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Alessandro Locati <me@fale.io>2017-04-19 15:44:44 +0100
committerFabio Alessandro Locati <me@fale.io>2017-04-19 15:44:44 +0100
commit3b451396df802edbf72169226f519152b189c7c3 (patch)
tree98ad5baa43143e112db64e41164173fd55327cc7
parent6978114e166ce5fd0737e0c2957a7315d4e5fa41 (diff)
downloadopenshift-3b451396df802edbf72169226f519152b189c7c3.tar.gz
openshift-3b451396df802edbf72169226f519152b189c7c3.tar.bz2
openshift-3b451396df802edbf72169226f519152b189c7c3.tar.xz
openshift-3b451396df802edbf72169226f519152b189c7c3.zip
Add /etc/sysconfig/etcd to etcd_container
The `/etc/sysconfig/etcd` file is often used to allow the usage of additional variables passed to the etcd daemon. Example of this is to make some new nodes join an existing cluster. Having two files simplify the automation around it, since in the `/etc/sysconfig/etcd` is possible to put temporary variables and then nuke the file as soon as they are not used anymore.
-rw-r--r--roles/etcd/templates/etcd.docker.service2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/etcd/templates/etcd.docker.service b/roles/etcd/templates/etcd.docker.service
index ae059b549..e4d1b57e6 100644
--- a/roles/etcd/templates/etcd.docker.service
+++ b/roles/etcd/templates/etcd.docker.service
@@ -7,7 +7,7 @@ PartOf=docker.service
[Service]
EnvironmentFile=/etc/etcd/etcd.conf
ExecStartPre=-/usr/bin/docker rm -f {{ etcd_service }}
-ExecStart=/usr/bin/docker run --name {{ etcd_service }} --rm -v /var/lib/etcd:/var/lib/etcd:z -v /etc/etcd:/etc/etcd:ro --env-file=/etc/etcd/etcd.conf --net=host --entrypoint=/usr/bin/etcd {{ openshift.etcd.etcd_image }}
+ExecStart=/usr/bin/docker run --name {{ etcd_service }} --rm -v /var/lib/etcd:/var/lib/etcd:z -v /etc/etcd:/etc/etcd:ro --env-file=/etc/etcd/etcd.conf --env-file=/etc/sysconfig/etcd --net=host --entrypoint=/usr/bin/etcd {{ openshift.etcd.etcd_image }}
ExecStop=/usr/bin/docker stop {{ etcd_service }}
SyslogIdentifier=etcd_container
Restart=always