Merge pull request #5429 from giuseppe/node-specify-dns-domain

Automatic merge from submit-queue

node: specify the DNS domain

roles/docker/tasks/systemcontainer_crio.yml

@@ -134,6 +134,14 @@
     image: "{{ l_crio_image }}"
     state: latest
 
+- name: Remove CRI-o default configuration files
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items:
+    - /etc/cni/net.d/200-loopback.conf
+    - /etc/cni/net.d/100-crio-bridge.conf
+
 - name: Create the CRI-O configuration
   template:
     dest: /etc/crio/crio.conf

roles/openshift_node/tasks/node_system_container.yml

@@ -9,4 +9,6 @@
   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