From 25d063197affef1e2ad65cb426005b3a7b5a3ecb Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Mon, 14 Jan 2019 13:00:48 +0530 Subject: [PATCH] Remove configuration for cni0 bridge By default podman configures cni0 bridge that uses 10.88.0.0/16. As we use host networking and the subnet range may conflict with other networks, it's good to remove it. Change-Id: I9b03a16a82fc04ffd069ae4e2eb3fcd301d67ba9 --- deployment/podman/podman-baremetal-ansible.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/deployment/podman/podman-baremetal-ansible.yaml b/deployment/podman/podman-baremetal-ansible.yaml index 6e166efd1f..119df26dc8 100644 --- a/deployment/podman/podman-baremetal-ansible.yaml +++ b/deployment/podman/podman-baremetal-ansible.yaml @@ -60,6 +60,14 @@ outputs: package: name: podman state: latest + - name: Remove default cni config for cni0 + copy: + dest: /etc/cni/net.d/87-podman-bridge.conflist + content: '' + force: yes + - name: Delete cni0 interface if exists + command: ip link delete cni0 + ignore_errors: True - name: configure insecure registries /etc/containers/registries.conf ini_file: path: /etc/containers/registries.conf @@ -72,3 +80,11 @@ outputs: - name: Install podman packages on upgrade if missing when: step|int == 3 package: name=podman state=latest + - name: Remove default cni config for cni0 + copy: + dest: /etc/cni/net.d/87-podman-bridge.conflist + content: '' + force: yes + - name: Delete cni0 interface if exists + command: ip link delete cni0 + ignore_errors: True