diff options
author | Scott Dodson <sdodson@redhat.com> | 2016-05-24 14:00:17 -0400 |
---|---|---|
committer | Andrew Butcher <abutcher@afrolegs.com> | 2016-05-24 14:00:17 -0400 |
commit | eab842f5b6e5c04cda06c94cf8db3281d82c8ad6 (patch) | |
tree | b1db958651234887d1c5f3d92dbbc195fa02c624 /roles/openshift_node/templates/openshift.docker.node.dep.service | |
parent | d22ea74e40519d050ad427a2657f104a41724c74 (diff) | |
download | openshift-eab842f5b6e5c04cda06c94cf8db3281d82c8ad6.tar.gz openshift-eab842f5b6e5c04cda06c94cf8db3281d82c8ad6.tar.bz2 openshift-eab842f5b6e5c04cda06c94cf8db3281d82c8ad6.tar.xz openshift-eab842f5b6e5c04cda06c94cf8db3281d82c8ad6.zip |
Conditionally bind mount /usr/bin/docker-current when it is present (#1941)
* Conditionally bind mount /usr/bin/docker-current when it is present
* fix upgrade
* add atomic-openshift-node-dep files to uninstall playbook
* Fix variable expansion
Diffstat (limited to 'roles/openshift_node/templates/openshift.docker.node.dep.service')
-rw-r--r-- | roles/openshift_node/templates/openshift.docker.node.dep.service | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/roles/openshift_node/templates/openshift.docker.node.dep.service b/roles/openshift_node/templates/openshift.docker.node.dep.service new file mode 100644 index 000000000..f66a78479 --- /dev/null +++ b/roles/openshift_node/templates/openshift.docker.node.dep.service @@ -0,0 +1,11 @@ +[Unit] +Requires=docker.service +After=docker.service +PartOf={{ openshift.common.service_type }}-node.service +Before={{ openshift.common.service_type }}-node.service + + +[Service] +ExecStart=/bin/bash -c "if [[ -f /usr/bin/docker-current ]]; then echo \"DOCKER_ADDTL_BIND_MOUNTS=--volume=/usr/bin/docker-current:/usr/bin/docker-current:ro\" > /etc/sysconfig/{{ openshift.common.service_type }}-node-dep; else echo \"#DOCKER_ADDTL_BIND_MOUNTS=\" > /etc/sysconfig/{{ openshift.common.service_type }}-node-dep; fi" +ExecStop= +SyslogIdentifier={{ openshift.common.service_type }}-node-dep |