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

Fix remnants of ocid -> crio rename

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2017-05-15 15:05:58 -07:00
parent 20e9aeb16f
commit 5e4809bdfe
11 changed files with 77 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/crio.8.md
View file

@ -81,10 +81,10 @@ crio is meant to provide an integration path between OCI conformant runtimes and
Image which contains the pause executable (default: "kubernetes/pause")
**--root**=""
OCID root dir (default: "/var/lib/containers/storage")
CRIO root dir (default: "/var/lib/containers/storage")
**--runroot**=""
OCID state dir (default: "/var/run/containers/storage")
CRIO state dir (default: "/var/run/containers/storage")
**--runtime**=""
OCI runtime path (default: "/usr/bin/runc")
@ -117,13 +117,13 @@ crio is meant to provide an integration path between OCI conformant runtimes and
Print the version
# COMMANDS
OCID's default command is to start the daemon. However, it currently offers a
CRIO's default command is to start the daemon. However, it currently offers a
single additional subcommand.
## config
Outputs a commented version of the configuration file that would've been used
by OCID. This allows you to save you current configuration setup and then load
by CRIO. This allows you to save you current configuration setup and then load
it later with **--config**. Global options will modify the output.
**--default**

22
docs/crio.conf.5.md
View file

@ -3,10 +3,10 @@
% OCTOBER 2016
# NAME
crio.conf - Syntax of OCID configuration file
crio.conf - Syntax of CRIO configuration file
# DESCRIPTION
The OCID configuration file specifies all of the available command-line options
The CRIO configuration file specifies all of the available command-line options
for the crio(8) program, but in a TOML format that can be more easily modified
and versioned.
@ -24,29 +24,29 @@ No bare options are used. The format of TOML can be simplified to:
[table.subtable2]
option = value
## OCID TABLE
## CRIO TABLE
The `crio` table supports the following options:
**root**=""
OCID root dir (default: "/var/lib/containers/storage")
CRIO root dir (default: "/var/lib/containers/storage")
**runroot**=""
OCID state dir (default: "/var/run/containers/storage")
CRIO state dir (default: "/var/run/containers/storage")
**storage_driver**=""
OCID storage driver (default is "devicemapper")
CRIO storage driver (default is "devicemapper")
**storage_option**=[]
OCID storage driver option list (no default)
CRIO storage driver option list (no default)
## OCID.API TABLE
## CRIO.API TABLE
**listen**=""
Path to crio socket (default: "/var/run/crio.sock")
## OCID.RUNTIME TABLE
## CRIO.RUNTIME TABLE
**conmon**=""
Path to the conmon executable (default: "/usr/local/libexec/crio/conmon")
@ -69,7 +69,7 @@ The `crio` table supports the following options:
**apparmor_profile**=""
Name of the apparmor profile to be used as the runtime's default (default: "crio-default")
## OCID.IMAGE TABLE
## CRIO.IMAGE TABLE
**default_transport**
A prefix to prepend to image names that can't be pulled as-is (default: "docker://")
@ -80,7 +80,7 @@ The `crio` table supports the following options:
**pause_image**=""
Image which contains the pause executable (default: "kubernetes/pause")
## OCID.NETWORK TABLE
## CRIO.NETWORK TABLE
**network_dir**=""
Path to CNI configuration files (default: "/etc/cni/net.d/")