---
- name: Pre-pull node system container image
  command: >
    atomic pull --storage=ostree {{ 'docker:' if openshift.common.system_images_registry == 'docker' else openshift.common.system_images_registry + '/' }}{{ openshift.node.node_system_image }}:{{ openshift_image_tag }}
  register: pull_result
  changed_when: "'Pulling layer' in pull_result.stdout"

- name: Install or Update node system container
  oc_atomic_container:
    name: "{{ openshift.common.service_type }}-node"
    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 }}"
    state: latest

---
- name: Pre-pull node system container image
  command: >
    atomic pull --storage=ostree {{ 'docker:' if openshift.common.system_images_registry == 'docker' else openshift.common.system_images_registry + '/' }}{{ openshift.node.node_system_image }}:{{ openshift_image_tag }}
  register: pull_result
  changed_when: "'Pulling layer' in pull_result.stdout"

- name: Install or Update node system container
  oc_atomic_container:
    name: "{{ openshift.common.service_type }}-node"
    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"
    state: latest

Set DOCKER_SERVICE for system container
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 change
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

Signed-off-by: Steve Milner <0ccc179a7064b1255abc26f4a484566ce33a1da2@redhat.com>
