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

Deprecate --storage-option for --storage-opt

Browse source 
container-storage-setup (Formerly docker-storage-setup) is being converted to
run with container runtimes outside of docker.  Specifically we want to use it
with CRI-O/ocid.  It does not know anything about the container runtimes it
is generating options for, so it generates them based on the storage CLI of
docker.  I see no reason to have the storage option for ocid to be different
and we can just depracate the option for now.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2017-02-24 17:05:07 -05:00
parent 3690f4c971
commit cf5b0ae57f
4 changed files with 9 additions and 9 deletions
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") {
config.Storage = ctx.GlobalString("storage-driver")
}
if ctx.GlobalIsSet("storage-option") {
config.StorageOptions = ctx.GlobalStringSlice("storage-option")
if ctx.GlobalIsSet("storage-opt") {
config.StorageOptions = ctx.GlobalStringSlice("storage-opt")
}
if ctx.GlobalIsSet("default-transport") {
config.DefaultTransport = ctx.GlobalString("default-transport")
@ -175,7 +175,7 @@ func main() {
Usage: "storage driver",
},
cli.StringSliceFlag{
Name: "storage-option",
Name: "storage-opt",
Usage: "storage driver option",
},
cli.StringFlag{