diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-11-09 17:00:00 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-11-16 09:03:35 -0500 |
commit | afa4fd5799b0ff43d625d061e4c2bde66b5fb86a (patch) | |
tree | 2654bb42deb7dcd3b907b1476ec0fbe55c133fb2 /roles/openshift_node_upgrade/templates/openshift.docker.node.dep.service | |
parent | 8a85bc3a00efb654238a58e1faa2a2629d9360b1 (diff) | |
download | openshift-afa4fd5799b0ff43d625d061e4c2bde66b5fb86a.tar.gz openshift-afa4fd5799b0ff43d625d061e4c2bde66b5fb86a.tar.bz2 openshift-afa4fd5799b0ff43d625d061e4c2bde66b5fb86a.tar.xz openshift-afa4fd5799b0ff43d625d061e4c2bde66b5fb86a.zip |
Combine openshift_node and openshift_node_upgrade
Currently, having openshift_node and openshift_node_upgrade
as two distinct roles has created a duplication across
handlers, templates, and some tasks.
This commit combines the roles to reduce duplication
and bugs encountered by not putting code in both places.
Diffstat (limited to 'roles/openshift_node_upgrade/templates/openshift.docker.node.dep.service')
-rw-r--r-- | roles/openshift_node_upgrade/templates/openshift.docker.node.dep.service | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/roles/openshift_node_upgrade/templates/openshift.docker.node.dep.service b/roles/openshift_node_upgrade/templates/openshift.docker.node.dep.service deleted file mode 100644 index aae35719c..000000000 --- a/roles/openshift_node_upgrade/templates/openshift.docker.node.dep.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Requires={{ openshift.docker.service_name }}.service -After={{ openshift.docker.service_name }}.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 --volume=/etc/sysconfig/docker:/etc/sysconfig/docker:ro --volume=/etc/containers/registries:/etc/containers/registries: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 |