diff options
| author | baude <bbaude@redhat.com> | 2017-12-20 15:13:52 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-12-22 19:23:36 +0000 |
| commit | 7f531263e6e41195278f205ad01274487cc1c1e0 (patch) | |
| tree | 1e162ee89a8302e16e743ec8d884f62d193ef2ef /contrib | |
| parent | b08ac1065ca0201cd66cf53bf6fc75470a70f398 (diff) | |
| download | podman-7f531263e6e41195278f205ad01274487cc1c1e0.tar.gz podman-7f531263e6e41195278f205ad01274487cc1c1e0.tar.bz2 podman-7f531263e6e41195278f205ad01274487cc1c1e0.zip | |
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 <bbaude@redhat.com>
Closes: #161
Approved by: baude
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cni/10-crio-bridge.conf | 15 | ||||
| -rw-r--r-- | contrib/cni/99-loopback.conf | 4 | ||||
| -rw-r--r-- | contrib/cni/README.md | 16 |
3 files changed, 0 insertions, 35 deletions
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 |