diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-08-02 18:44:08 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-08-04 11:27:02 +0200 |
| commit | 31e708a5d440a6ad13f81c4b94ad26e0b2d9587a (patch) | |
| tree | 5ecb5184869d7c04e271fbde11930d6c80941d05 | |
| parent | 39cf5084f18e2e0adca46b925660a6f2c38d227c (diff) | |
| download | openshift-31e708a5d440a6ad13f81c4b94ad26e0b2d9587a.tar.gz openshift-31e708a5d440a6ad13f81c4b94ad26e0b2d9587a.tar.bz2 openshift-31e708a5d440a6ad13f81c4b94ad26e0b2d9587a.tar.xz openshift-31e708a5d440a6ad13f81c4b94ad26e0b2d9587a.zip | |
cri-o: configure the CNI network
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | roles/docker/tasks/systemcontainer_crio.yml | 10 | ||||
| -rw-r--r-- | roles/docker/templates/80-openshift-sdn.conf.j2 | 5 |
2 files changed, 15 insertions, 0 deletions
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" +} |