summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-30 10:32:53 -0400
committerGitHub <noreply@github.com>2017-06-30 10:32:53 -0400
commitca089c724a7a44efa6abb88313a461f9f7cda122 (patch)
tree45661f65e68d866a63d1aac567063ce332bd0aa3 /roles
parent820206a73ee0a4b2e7084331e6166afe5dff5962 (diff)
parentc7f631b3e233eb477fd5921ddf7ff720142a3a4e (diff)
downloadopenshift-ca089c724a7a44efa6abb88313a461f9f7cda122.tar.gz
openshift-ca089c724a7a44efa6abb88313a461f9f7cda122.tar.bz2
openshift-ca089c724a7a44efa6abb88313a461f9f7cda122.tar.xz
openshift-ca089c724a7a44efa6abb88313a461f9f7cda122.zip
Merge pull request #4653 from ingvagabund/run-etcd_container_with-spc_t-label
run etcd_container with type:spc_t label
Diffstat (limited to 'roles')
-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 adeca7a91..d9327f433 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 --security-opt label=type:spc_t --entrypoint=/usr/bin/etcd {{ openshift.etcd.etcd_image }}
ExecStop=/usr/bin/docker stop {{ etcd_service }}
SyslogIdentifier=etcd_container
Restart=always