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

4
docs/ocid.8.md
View file

@ -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**=""