summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-21 01:25:55 -0700
committerGitHub <noreply@github.com>2017-09-21 01:25:55 -0700
commit00400ee296d285328353464b53c059c06e224315 (patch)
tree8a843de23d8685d35ec7e8bfae4b41102b3b62da /roles
parenta3906249b7a1752bb6fb42da6ceb72279fd67e90 (diff)
parent209c2fa22d82474edccba397ea034074181fa470 (diff)
downloadopenshift-00400ee296d285328353464b53c059c06e224315.tar.gz
openshift-00400ee296d285328353464b53c059c06e224315.tar.bz2
openshift-00400ee296d285328353464b53c059c06e224315.tar.xz
openshift-00400ee296d285328353464b53c059c06e224315.zip
Merge pull request #5429 from giuseppe/node-specify-dns-domain
Automatic merge from submit-queue node: specify the DNS domain
Diffstat (limited to 'roles')
-rw-r--r--roles/docker/tasks/systemcontainer_crio.yml8
-rw-r--r--roles/openshift_node/tasks/node_system_container.yml2
2 files changed, 10 insertions, 0 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml
index 0bab0899c..8208fa68d 100644
--- a/roles/docker/tasks/systemcontainer_crio.yml
+++ b/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
diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml
index b2dceedbe..0ca44c292 100644
--- a/roles/openshift_node/tasks/node_system_container.yml
+++ b/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