summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-04-25 10:40:00 -0400
committerGitHub <noreply@github.com>2017-04-25 10:40:00 -0400
commitd5a3602931c2a3f273d32caa5036fa2adc98eb30 (patch)
tree628a250d47dd3a6c3577e6a92f31417bf14b77d1
parente19f6d832e7c60c0944fa511d3ef233631c8ecab (diff)
parentd6e696b4f7905e2b7961e10fe8e6448988717dea (diff)
downloadopenshift-d5a3602931c2a3f273d32caa5036fa2adc98eb30.tar.gz
openshift-d5a3602931c2a3f273d32caa5036fa2adc98eb30.tar.bz2
openshift-d5a3602931c2a3f273d32caa5036fa2adc98eb30.tar.xz
openshift-d5a3602931c2a3f273d32caa5036fa2adc98eb30.zip
Merge pull request #3998 from openshift/revert-3955-fix_etcd_paths
Revert "Add /etc/sysconfig/etcd to etcd_container"
-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 e4d1b57e6..ae059b549 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 --env-file=/etc/sysconfig/etcd --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 --net=host --entrypoint=/usr/bin/etcd {{ openshift.etcd.etcd_image }}
ExecStop=/usr/bin/docker stop {{ etcd_service }}
SyslogIdentifier=etcd_container
Restart=always