From cf5b0ae57f2cbdae6511da0ce0647b0ab374b7be Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Fri, 24 Feb 2017 17:05:07 -0500
Subject: [PATCH] Deprecate --storage-option for --storage-opt

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>
---
 cmd/ocid/main.go        | 6 +++---
 docs/ocid.8.md          | 4 ++--
 test/bin2img/bin2img.go | 4 ++--
 test/copyimg/copyimg.go | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd/ocid/main.go b/cmd/ocid/main.go
index a87cdd1d..296ae7bb 100644
--- a/cmd/ocid/main.go
+++ b/cmd/ocid/main.go
@@ -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{
diff --git a/docs/ocid.8.md b/docs/ocid.8.md
index 0f007e07..89592b1a 100644
--- a/docs/ocid.8.md
+++ b/docs/ocid.8.md
@@ -21,7 +21,7 @@ ocid - Enable OCI Kubernetes Container Runtime daemon
 [**--runtime**=[*value*]]
 [**--signature-policy**=[*value*]]
 [**--storage-driver**=[*value*]]
-[**--storage-option**=[*value*]]
+[**--storage-opt**=[*value*]]
 [**--selinux**]
 [**--seccomp-profile**=[*value*]]
 [**--apparmor-profile**=[*value*]]
@@ -101,7 +101,7 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
 **--storage-driver**
   OCI storage driver (default: "devicemapper")
 
-**--storage-option**
+**--storage-opt**
   OCI storage driver option (no default)
 
 **--cni-config-dir**=""
diff --git a/test/bin2img/bin2img.go b/test/bin2img/bin2img.go
index c2d1e41e..49c30621 100644
--- a/test/bin2img/bin2img.go
+++ b/test/bin2img/bin2img.go
@@ -47,7 +47,7 @@ func main() {
 			Usage: "storage driver",
 		},
 		cli.StringSliceFlag{
-			Name:  "storage-option",
+			Name:  "storage-opt",
 			Usage: "storage option",
 		},
 		cli.StringFlag{
@@ -72,7 +72,7 @@ func main() {
 		rootDir := c.GlobalString("root")
 		runrootDir := c.GlobalString("runroot")
 		storageDriver := c.GlobalString("storage-driver")
-		storageOptions := c.GlobalStringSlice("storage-option")
+		storageOptions := c.GlobalStringSlice("storage-opt")
 		imageName := c.GlobalString("image-name")
 		sourceBinary := c.GlobalString("source-binary")
 		imageBinary := c.GlobalString("image-binary")
diff --git a/test/copyimg/copyimg.go b/test/copyimg/copyimg.go
index ba8a7849..9ea952a5 100644
--- a/test/copyimg/copyimg.go
+++ b/test/copyimg/copyimg.go
@@ -42,7 +42,7 @@ func main() {
 			Usage: "storage driver",
 		},
 		cli.StringSliceFlag{
-			Name:  "storage-option",
+			Name:  "storage-opt",
 			Usage: "storage option",
 		},
 		cli.StringFlag{
@@ -76,7 +76,7 @@ func main() {
 		rootDir := c.GlobalString("root")
 		runrootDir := c.GlobalString("runroot")
 		storageDriver := c.GlobalString("storage-driver")
-		storageOptions := c.GlobalStringSlice("storage-option")
+		storageOptions := c.GlobalStringSlice("storage-opt")
 		signaturePolicy := c.GlobalString("signature-policy")
 		imageName := c.GlobalString("image-name")
 		addName := c.GlobalString("add-name")