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

Merge pull request #373 from rhatdan/storage-opt

Browse source 
Depracate --storage-option for --storage-opt
This commit is contained in:
Mrunal Patel 2017-02-25 20:56:29 -08:00 committed by GitHub
commit ecb7718ae9
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/ocid/main.go
View file

@ -57,8 +57,8 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error {
if ctx.GlobalIsSet("storage-driver") { if ctx.GlobalIsSet("storage-driver") {
config.Storage = ctx.GlobalString("storage-driver") config.Storage = ctx.GlobalString("storage-driver")
} }
if ctx.GlobalIsSet("storage-option") { if ctx.GlobalIsSet("storage-opt") {
config.StorageOptions = ctx.GlobalStringSlice("storage-option") config.StorageOptions = ctx.GlobalStringSlice("storage-opt")
} }
if ctx.GlobalIsSet("default-transport") { if ctx.GlobalIsSet("default-transport") {
config.DefaultTransport = ctx.GlobalString("default-transport") config.DefaultTransport = ctx.GlobalString("default-transport")
@ -175,7 +175,7 @@ func main() {
Usage: "storage driver", Usage: "storage driver",
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "storage-option", Name: "storage-opt",
Usage: "storage driver option", Usage: "storage driver option",
}, },
cli.StringFlag{ cli.StringFlag{

4
docs/ocid.8.md
View file

@ -21,7 +21,7 @@ ocid - Enable OCI Kubernetes Container Runtime daemon
[**--runtime**=[*value*]] [**--runtime**=[*value*]]
[**--signature-policy**=[*value*]] [**--signature-policy**=[*value*]]
[**--storage-driver**=[*value*]] [**--storage-driver**=[*value*]]
[**--storage-option**=[*value*]] [**--storage-opt**=[*value*]]
[**--selinux**] [**--selinux**]
[**--seccomp-profile**=[*value*]] [**--seccomp-profile**=[*value*]]
[**--apparmor-profile**=[*value*]] [**--apparmor-profile**=[*value*]]
@ -101,7 +101,7 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
**--storage-driver** **--storage-driver**
OCI storage driver (default: "devicemapper") OCI storage driver (default: "devicemapper")
**--storage-option** **--storage-opt**
OCI storage driver option (no default) OCI storage driver option (no default)
**--cni-config-dir**="" **--cni-config-dir**=""

4
test/bin2img/bin2img.go
View file

@ -47,7 +47,7 @@ func main() {
Usage: "storage driver", Usage: "storage driver",
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "storage-option", Name: "storage-opt",
Usage: "storage option", Usage: "storage option",
}, },
cli.StringFlag{ cli.StringFlag{
@ -72,7 +72,7 @@ func main() {
rootDir := c.GlobalString("root") rootDir := c.GlobalString("root")
runrootDir := c.GlobalString("runroot") runrootDir := c.GlobalString("runroot")
storageDriver := c.GlobalString("storage-driver") storageDriver := c.GlobalString("storage-driver")
storageOptions := c.GlobalStringSlice("storage-option") storageOptions := c.GlobalStringSlice("storage-opt")
imageName := c.GlobalString("image-name") imageName := c.GlobalString("image-name")
sourceBinary := c.GlobalString("source-binary") sourceBinary := c.GlobalString("source-binary")
imageBinary := c.GlobalString("image-binary") imageBinary := c.GlobalString("image-binary")

4
test/copyimg/copyimg.go
View file

@ -42,7 +42,7 @@ func main() {
Usage: "storage driver", Usage: "storage driver",
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "storage-option", Name: "storage-opt",
Usage: "storage option", Usage: "storage option",
}, },
cli.StringFlag{ cli.StringFlag{
@ -76,7 +76,7 @@ func main() {
rootDir := c.GlobalString("root") rootDir := c.GlobalString("root")
runrootDir := c.GlobalString("runroot") runrootDir := c.GlobalString("runroot")
storageDriver := c.GlobalString("storage-driver") storageDriver := c.GlobalString("storage-driver")
storageOptions := c.GlobalStringSlice("storage-option") storageOptions := c.GlobalStringSlice("storage-opt")
signaturePolicy := c.GlobalString("signature-policy") signaturePolicy := c.GlobalString("signature-policy")
imageName := c.GlobalString("image-name") imageName := c.GlobalString("image-name")
addName := c.GlobalString("add-name") addName := c.GlobalString("add-name")