diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-11-20 17:43:08 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-11-20 17:43:08 -0500 |
commit | 85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e (patch) | |
tree | 94a48919c5bd29a7653486309b4929fb21ac7d8b /roles/etcd/templates | |
parent | 6313f519307cf50055589c3876d8bec398bbc4d4 (diff) | |
download | openshift-85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e.tar.gz openshift-85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e.tar.bz2 openshift-85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e.tar.xz openshift-85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e.zip |
Refactor etcd image
Simplify logic for etcd_image
Diffstat (limited to 'roles/etcd/templates')
-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 adeca7a91..99ae37319 100644 --- a/roles/etcd/templates/etcd.docker.service +++ b/roles/etcd/templates/etcd.docker.service @@ -7,7 +7,7 @@ PartOf={{ openshift.docker.service_name }}.service [Service] EnvironmentFile={{ etcd_conf_file }} ExecStartPre=-/usr/bin/docker rm -f {{ etcd_service }} -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 }} +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 {{ etcd_image }} ExecStop=/usr/bin/docker stop {{ etcd_service }} SyslogIdentifier=etcd_container Restart=always |