From 7f531263e6e41195278f205ad01274487cc1c1e0 Mon Sep 17 00:00:00 2001 From: baude Date: Wed, 20 Dec 2017 15:13:52 -0600 Subject: Add default CNI configuration podman needs a pair of configuration files to set up its default network configuration: a bridge and loopback file. Signed-off-by: baude Closes: #161 Approved by: baude --- contrib/cni/10-crio-bridge.conf | 15 --------------- contrib/cni/99-loopback.conf | 4 ---- contrib/cni/README.md | 16 ---------------- 3 files changed, 35 deletions(-) delete mode 100644 contrib/cni/10-crio-bridge.conf delete mode 100644 contrib/cni/99-loopback.conf delete mode 100644 contrib/cni/README.md (limited to 'contrib') diff --git a/contrib/cni/10-crio-bridge.conf b/contrib/cni/10-crio-bridge.conf deleted file mode 100644 index 27f0ddfec..000000000 --- a/contrib/cni/10-crio-bridge.conf +++ /dev/null @@ -1,15 +0,0 @@ -{ - "cniVersion": "0.2.0", - "name": "crio-bridge", - "type": "bridge", - "bridge": "cni0", - "isGateway": true, - "ipMasq": true, - "ipam": { - "type": "host-local", - "subnet": "10.88.0.0/16", - "routes": [ - { "dst": "0.0.0.0/0" } - ] - } -} diff --git a/contrib/cni/99-loopback.conf b/contrib/cni/99-loopback.conf deleted file mode 100644 index dd6630a85..000000000 --- a/contrib/cni/99-loopback.conf +++ /dev/null @@ -1,4 +0,0 @@ -{ - "cniVersion": "0.2.0", - "type": "loopback" -} diff --git a/contrib/cni/README.md b/contrib/cni/README.md deleted file mode 100644 index 78e22fd36..000000000 --- a/contrib/cni/README.md +++ /dev/null @@ -1,16 +0,0 @@ -## `contrib/cni` ## - -There are a wide variety of different [CNI][cni] network configurations. This -directory just contains some example configurations that can be used as the -basis for your own configurations (distributions should package these files in -example directories). - -To use these configurations, place them in `/etc/cni/net.d` (or the directory -specified by `crio.network.network_dir` in your `crio.conf`). - -In addition, you need to install the [CNI plugins][cni] necessary into -`/opt/cni/bin` (or the directory specified by `crio.network.plugin_dir`). The -two plugins necessary for the example CNI configurations are `loopback` and -`bridge`. - -[cni]: https://github.com/containernetworking/plugins -- cgit v1.2.3-54-g00ecf