diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-19 17:14:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 17:14:23 -0500 |
| commit | b3776499898b2780702c68a41e1721badaf8e7d4 (patch) | |
| tree | 69257c54876d53304116f3a3273400d7750a0404 | |
| parent | 68fd5b42e05e8bfc4228999ca2cdee4c4f5e8259 (diff) | |
| parent | 3b451396df802edbf72169226f519152b189c7c3 (diff) | |
| download | openshift-b3776499898b2780702c68a41e1721badaf8e7d4.tar.gz openshift-b3776499898b2780702c68a41e1721badaf8e7d4.tar.bz2 openshift-b3776499898b2780702c68a41e1721badaf8e7d4.tar.xz openshift-b3776499898b2780702c68a41e1721badaf8e7d4.zip | |
Merge pull request #3955 from Fale/fix_etcd_paths
Merged by openshift-bot
| -rw-r--r-- | roles/etcd/templates/etcd.docker.service | 2 |
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 |