diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-08-07 14:29:20 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2019-08-23 11:27:28 -0400 |
| commit | 7b4102ce286b5b52f5cbd9df832222f7c543e35c (patch) | |
| tree | f50dd79590f00b6f51ec7741d160cb754c28ed64 /contrib | |
| parent | 59261cf014678b374c4b0d27077de5d0689d6f0c (diff) | |
| download | podman-7b4102ce286b5b52f5cbd9df832222f7c543e35c.tar.gz podman-7b4102ce286b5b52f5cbd9df832222f7c543e35c.tar.bz2 podman-7b4102ce286b5b52f5cbd9df832222f7c543e35c.zip | |
Adjust name of Podman CNI network bridge
Both Podman and CRI-O set up CNI bridges with the name 'cni0'. If
both our CNI conflist and the CRI-O conflist are installed,
whoever runs first will win - that is, they will configure the
bridge, and everyone will use it. Problem: the CRI-O CNI config
conflicts with ours and results in containers with no networking.
Solution: rename our bridge so we don't conflict with CRI-O.
At the same time, hit our IPAM configuration. The current version
was an older format in danger of deprecation. The new format is
documented at [1].
Finally, fix indentation for the entire file.
[1] https://github.com/containernetworking/plugins/tree/master/plugins/ipam/host-local#example-configurations
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions