diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-21 13:43:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 13:43:54 -0400 |
| commit | 0291928abb27aceda429088eede903604a1e9bbd (patch) | |
| tree | 4f6efed902d338c8b8eb7fdb79247b29e2551e9a /cni/README.md | |
| parent | 1b8d0e454353224a571bcec7d37240140ec7917f (diff) | |
| parent | 330e9144bd49a090484ade39339b3c3453253105 (diff) | |
| download | podman-0291928abb27aceda429088eede903604a1e9bbd.tar.gz podman-0291928abb27aceda429088eede903604a1e9bbd.tar.bz2 podman-0291928abb27aceda429088eede903604a1e9bbd.zip | |
Merge pull request #7033 from rhatdan/v2.0
[2.0] Switch references from libpod.conf to containers.conf
Diffstat (limited to 'cni/README.md')
| -rw-r--r-- | cni/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cni/README.md b/cni/README.md index 2683df714..bc37df1eb 100644 --- a/cni/README.md +++ b/cni/README.md @@ -5,7 +5,7 @@ directory just contains an example configuration that can be used as the basis for your own configuration. To use this configuration, place it in `/etc/cni/net.d` (or the directory -specified by `cni_config_dir` in your `libpod.conf`). +specified by `cni_config_dir` in your `containers.conf`). For example a basic network configuration can be achieved with: @@ -14,4 +14,4 @@ sudo mkdir -p /etc/cni/net.d curl -qsSL https://raw.githubusercontent.com/containers/libpod/master/cni/87-podman-bridge.conflist | sudo tee /etc/cni/net.d/87-podman-bridge.conf ``` -Dependent upon your CNI configuration, you will need to install as a minimum the `port` and `bridge` [CNI plugins](https://github.com/containernetworking/plugins) into `/opt/cni/bin` (or the directory specified by `cni_plugin_dir` in libpod.conf). Please refer to the [CNI](https://github.com/containernetworking) project page in GitHub for more information. +Dependent upon your CNI configuration, you will need to install as a minimum the `port` and `bridge` [CNI plugins](https://github.com/containernetworking/plugins) into `/opt/cni/bin` (or the directory specified by `cni_plugin_dir` in containers.conf). Please refer to the [CNI](https://github.com/containernetworking) project page in GitHub for more information. |