diff options
author | Scott Dodson <sdodson@redhat.com> | 2016-11-29 13:06:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-29 13:06:24 -0500 |
commit | 734b9ae199bd585d24c5131f3403345fe88fe5e6 (patch) | |
tree | 9ba5954e35ebdfb634c3332adcdf54320ef4d5e4 /roles/etcd | |
parent | 4c2a6db2b968abdf7ab641340700856ff179e8e3 (diff) | |
parent | 64a8eae55bf09c6b258563230329a8f205a7bc3d (diff) | |
download | openshift-734b9ae199bd585d24c5131f3403345fe88fe5e6.tar.gz openshift-734b9ae199bd585d24c5131f3403345fe88fe5e6.tar.bz2 openshift-734b9ae199bd585d24c5131f3403345fe88fe5e6.tar.xz openshift-734b9ae199bd585d24c5131f3403345fe88fe5e6.zip |
Merge pull request #2876 from dustymabe/dusty-fix-etcd-selinux
fix selinux issues with etcd container
Diffstat (limited to 'roles/etcd')
-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 cf957ede8..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:z --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 --net=host --entrypoint=/usr/bin/etcd {{ openshift.etcd.etcd_image }} ExecStop=/usr/bin/docker stop {{ etcd_service }} SyslogIdentifier=etcd_container Restart=always |