From 80c62021c829ceb878b8d51cedeca6fd6c688dd0 Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Fri, 20 Jan 2017 23:15:12 +0000 Subject: Update container format choices The choices for valid container formats is out of date in the image v1 and v2 help text. This patch adds 'ova' and 'docker' and does some minor refactoring to align the container_format option with the disk_format option. Change-Id: Icdea5fab801abd651baf45cf96c920c7df79f11b Closes-bug: #1658138 --- doc/source/command-objects/image.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'doc/source/command-objects') diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst index 999842af..7a9ead5c 100644 --- a/doc/source/command-objects/image.rst +++ b/doc/source/command-objects/image.rst @@ -76,7 +76,8 @@ Create/upload an image .. option:: --container-format - Image container format (default: bare) + Image container format. The supported options are: ami, ari, aki, + bare, docker, ova, ovf. The default format is: bare .. option:: --disk-format @@ -342,7 +343,8 @@ Set image properties .. option:: --container-format - Image container format (default: bare) + Image container format. The supported options are: ami, ari, aki, + bare, docker, ova, ovf. .. option:: --disk-format -- cgit v1.2.1