From 31e708a5d440a6ad13f81c4b94ad26e0b2d9587a Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 2 Aug 2017 18:44:08 +0200 Subject: cri-o: configure the CNI network Signed-off-by: Giuseppe Scrivano --- roles/docker/tasks/systemcontainer_crio.yml | 10 ++++++++++ roles/docker/templates/80-openshift-sdn.conf.j2 | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 roles/docker/templates/80-openshift-sdn.conf.j2 diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml index f18a5b117..787f51f94 100644 --- a/roles/docker/tasks/systemcontainer_crio.yml +++ b/roles/docker/tasks/systemcontainer_crio.yml @@ -125,6 +125,16 @@ src: crio.conf.j2 backup: yes +- name: Ensure CNI configuration directory exists + file: + path: /etc/cni/net.d/ + state: directory + +- name: Configure the CNI network + template: + dest: /etc/cni/net.d/openshift-sdn.conf + src: 80-openshift-sdn.conf.j2 + - name: Start the CRI-O service systemd: name: "cri-o" diff --git a/roles/docker/templates/80-openshift-sdn.conf.j2 b/roles/docker/templates/80-openshift-sdn.conf.j2 new file mode 100644 index 000000000..a693aea5f --- /dev/null +++ b/roles/docker/templates/80-openshift-sdn.conf.j2 @@ -0,0 +1,5 @@ +{ + "cniVersion": "0.1.0", + "name": "openshift-sdn", + "type": "openshift-sdn" +} -- cgit v1.2.3