diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-06-15 10:10:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 10:10:40 -0400 |
| commit | 5c095116ff23ee1ccbe6ba0407cff0fb05d9980d (patch) | |
| tree | 348de80b78471f39e3c1a1a846f316435fb41bdf /roles | |
| parent | bd1d671b6d7c3c0c37b2c248fed7528a22527aaf (diff) | |
| parent | 1960ee8c4db904e7c2d4a9a76d12edf7183894e2 (diff) | |
| download | openshift-5c095116ff23ee1ccbe6ba0407cff0fb05d9980d.tar.gz openshift-5c095116ff23ee1ccbe6ba0407cff0fb05d9980d.tar.bz2 openshift-5c095116ff23ee1ccbe6ba0407cff0fb05d9980d.tar.xz openshift-5c095116ff23ee1ccbe6ba0407cff0fb05d9980d.zip | |
Merge pull request #2037 from ibotty/docker-current_fixes
also volume-mount /etc/sysconfig/docker
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_node/templates/openshift.docker.node.dep.service | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/templates/openshift.docker.node.dep.service b/roles/openshift_node/templates/openshift.docker.node.dep.service index f66a78479..0fb34cffd 100644 --- a/roles/openshift_node/templates/openshift.docker.node.dep.service +++ b/roles/openshift_node/templates/openshift.docker.node.dep.service @@ -6,6 +6,6 @@ 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" +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 --volume=/etc/sysconfig/docker:/etc/sysconfig/docker: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 |