diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-01 02:47:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-01 02:47:33 -0700 |
| commit | a9271345b868ca4e9f858d87dd89a31e324ec858 (patch) | |
| tree | e76f58756c5b3b4c663a78036a18d26758469c04 /roles/docker/templates/overlay.conf.j2 | |
| parent | ab8fc38c62e2b56e37518c86a2ecd68596f8cc1a (diff) | |
| parent | f9f5947c7970cb2de952d419505ad1714094ff14 (diff) | |
| download | openshift-a9271345b868ca4e9f858d87dd89a31e324ec858.tar.gz openshift-a9271345b868ca4e9f858d87dd89a31e324ec858.tar.bz2 openshift-a9271345b868ca4e9f858d87dd89a31e324ec858.tar.xz openshift-a9271345b868ca4e9f858d87dd89a31e324ec858.zip | |
Merge pull request #5599 from ashcrow/node-start-fix
Automatic merge from submit-queue.
openshift_node: Set DOCKER_SERVICE for system container
The node system container was being installed with the ```DOCKER_SERVICE```
holding to it's ```manifest.json``` default of docker.service. This chage
adds the ```DOCKER_SERVICE``` parameter on node system container install
so that it uses the same value from the installer stored in
```openshift.docker.service_name```.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1496707
Diffstat (limited to 'roles/docker/templates/overlay.conf.j2')
0 files changed, 0 insertions, 0 deletions