diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-04-30 10:05:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-30 10:05:36 +0200 |
| commit | f5346c16e4ea67a4dfcd9814d486e4bf9f6202db (patch) | |
| tree | fc54550d7d3a2e8b2beedcbd17437ce371faa2e6 /roles/etcd/templates/etcd.docker.service | |
| parent | 0f01637c94abcdf3e17f4d2e62ca4db8b5440e6a (diff) | |
| parent | c9688b8571500878d10632740d14b4b9fb9dcc7f (diff) | |
| download | openshift-f5346c16e4ea67a4dfcd9814d486e4bf9f6202db.tar.gz openshift-f5346c16e4ea67a4dfcd9814d486e4bf9f6202db.tar.bz2 openshift-f5346c16e4ea67a4dfcd9814d486e4bf9f6202db.tar.xz openshift-f5346c16e4ea67a4dfcd9814d486e4bf9f6202db.zip | |
Merge pull request #3817 from ingvagabund/polish-etcd-role
Refactor etcd roles
Diffstat (limited to 'roles/etcd/templates/etcd.docker.service')
| -rw-r--r-- | roles/etcd/templates/etcd.docker.service | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/etcd/templates/etcd.docker.service b/roles/etcd/templates/etcd.docker.service index ae059b549..c8ceaa6ba 100644 --- a/roles/etcd/templates/etcd.docker.service +++ b/roles/etcd/templates/etcd.docker.service @@ -5,9 +5,9 @@ Requires=docker.service PartOf=docker.service [Service] -EnvironmentFile=/etc/etcd/etcd.conf +EnvironmentFile={{ etcd_conf_file }} 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 {{ etcd_data_dir }}:{{ etcd_data_dir }}:z -v {{ etcd_conf_dir }}:{{ etcd_conf_dir }}:ro --env-file={{ etcd_conf_file }} --net=host --entrypoint=/usr/bin/etcd {{ openshift.etcd.etcd_image }} ExecStop=/usr/bin/docker stop {{ etcd_service }} SyslogIdentifier=etcd_container Restart=always |