Skip to content

Commit 554fc73

Browse files
committed
common/docs: remove cni
Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent bccb31b commit 554fc73

File tree

1 file changed

+4
-22
lines changed

1 file changed

+4
-22
lines changed

common/docs/containers.conf.5.md

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -418,34 +418,18 @@ Specified as "directory-on-host:directory-in-container:options".
418418
Example: "/db:/var/lib/db:ro".
419419

420420
## NETWORK TABLE
421-
The `network` table contains settings pertaining to the management of CNI
421+
The `network` table contains settings pertaining to the management of netavark
422422
plugins.
423423

424424
**network_backend**=""
425425

426426
Network backend determines what network driver will be used to set up and tear down container networks.
427-
Valid values are "cni" and "netavark".
428-
The default value is empty which means that it will automatically choose CNI or netavark. If there are
429-
already containers/images or CNI networks preset it will choose CNI.
427+
Valid value is "netavark".
428+
The default value is empty which means that it will automatically choose netavark.
430429

431430
Before changing this value all containers must be stopped otherwise it is likely that
432431
iptables rules and network interfaces might leak on the host. A reboot will fix this.
433432

434-
**cni_plugin_dirs**=[]
435-
436-
List of paths to directories where CNI plugin binaries are located.
437-
438-
The default list is:
439-
```
440-
cni_plugin_dirs = [
441-
"/usr/local/libexec/cni",
442-
"/usr/libexec/cni",
443-
"/usr/local/lib/cni",
444-
"/usr/lib/cni",
445-
"/opt/cni/bin",
446-
]
447-
```
448-
449433
**netavark_plugin_dirs**=[]
450434

451435
List of directories that will be searched for netavark plugins.
@@ -498,11 +482,9 @@ default_subnet_pools = [
498482
Configure which rootless network program to use by default. Valid option is
499483
`pasta` (default).
500484

501-
**network_config_dir**="/etc/cni/net.d/"
485+
**network_config_dir**="/etc/containers/networks/"
502486

503487
Path to the directory where network configuration files are located.
504-
For the CNI backend the default is __/etc/cni/net.d__ as root
505-
and __$HOME/.config/cni/net.d__ as rootless.
506488
For the netavark backend "/etc/containers/networks" is used as root
507489
and "$graphroot/networks" as rootless.
508490

0 commit comments

Comments
 (0)