Browse Source

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
OpenShift Merge Robot 7 years ago
parent
commit
a9271345b8
1 changed files with 2 additions and 0 deletions
  1. 2 0
      roles/openshift_node/tasks/node_system_container.yml

+ 2 - 0
roles/openshift_node/tasks/node_system_container.yml

@@ -11,4 +11,6 @@
     image: "{{ 'docker:' if openshift.common.system_images_registry == 'docker' else openshift.common.system_images_registry + '/' }}{{ openshift.node.node_system_image }}:{{ openshift_image_tag }}"
     values:
     - "DNS_DOMAIN={{ openshift.common.dns_domain }}"
+    - "DOCKER_SERVICE={{ openshift.docker.service_name }}.service"
+    - "MASTER_SERVICE={{ openshift.common.service_type }}.service"
     state: latest