vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

main: Add CNI options

Browse source 
We add 2 ocid options for choosing the CNI configuration and plugin
binaries directories: --cni-config-dir and --cni-plugin-dir.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2016-12-17 12:23:07 +01:00
parent 50a3958e5a
commit c525459000
No known key found for this signature in database
GPG key ID: 8A803CDD4F566C4A
6 changed files with 61 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/ocid.8.md
View file

@ -21,6 +21,8 @@ ocid - Enable OCI Kubernetes Container Runtime daemon
[**--selinux**]
[**--seccomp-profile**=[*value*]]
[**--apparmor-profile**=[*value*]]
[**---cni-config-dir**=[*value*]]
[**---cni-plugin-dir**=[*value*]]
[**--version**|**-v**]
# DESCRIPTION
@ -86,6 +88,12 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
**--apparmor_profile**=""
Name of the apparmor profile to be used as the runtime's default (default: "ocid-default")
**--cni-config-dir**=""
CNI configuration files directory (defautl: "/etc/cni/net.d/")
**--cni-plugin-dir**=""
CNI plugin binaries directory (defautl: "/opt/cni/bin/")
**--version, -v**
Print the version

8
docs/ocid.conf.5.md
View file

@ -69,6 +69,14 @@ The `ocid` table supports the following options:
**pause**=""
Path to the pause executable (default: "/usr/libexec/ocid/pause")
## OCID.NETWORK TABLE
**network_dir**=""
Path to CNI configuration files (default: "/etc/cni/net.d/")
**plugin_dir**=""
Path to CNI plugin binaries (default: "/opt/cni/bin/")
# SEE ALSO
ocid(8)