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

4
cmd/crio/config.go
View file

@ -12,11 +12,11 @@ var commentedConfigTemplate = template.Must(template.New("config").Parse(`
# The "crio" table contains all of the server options.
[crio]
# root is a path to the "root directory". OCID stores all of its data,
# root is a path to the "root directory". CRIO stores all of its data,
# including container images, in this directory.
root = "{{ .Root }}"
# run is a path to the "run directory". OCID stores all of its state
# run is a path to the "run directory". CRIO stores all of its state
# in this directory.
runroot = "{{ .RunRoot }}"

6
cmd/crio/main.go
View file

@ -20,7 +20,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
)
const ociConfigPath = "/etc/crio/crio.conf"
const crioConfigPath = "/etc/crio/crio.conf"
func mergeConfig(config *server.Config, ctx *cli.Context) error {
// Don't parse the config if the user explicitly set it to "".
@ -33,7 +33,7 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error {
// We don't error out if --config wasn't explicitly set and the
// default doesn't exist. But we will log a warning about it, so
// the user doesn't miss it.
logrus.Warnf("default configuration file does not exist: %s", ociConfigPath)
logrus.Warnf("default configuration file does not exist: %s", crioConfigPath)
}
}
@ -127,7 +127,7 @@ func main() {
app.Flags = []cli.Flag{
cli.StringFlag{
Name: "config",
Value: ociConfigPath,
Value: crioConfigPath,
Usage: "path to configuration file",
},
cli.StringFlag{