From 201b1cee86a4df8ede6c97d962ac331ad0378140 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Tue, 22 Sep 2015 17:17:37 -0500
Subject: Clean up Image v2 image set command

Make the Image v2 image set command meet at the intersection of the v1
image set command and the v2 image create command:

* Add visibility to the deadopts list and remove the option
* Put the options in the same order as v1 image set
* Make the help text match
* Add --properties
* Move the additional options that do not appear in either v1 image set or
  v2 image create after --property as they are really pre-defined properties
* Add tests for v2 image set to match v1 and then some
* Put the SetImage class in v2/image.py in alphabetical order

Change-Id: I102b914e8ad09a014f6fdd846c5766b6c2eaadb8
---
 doc/source/command-objects/image.rst | 41 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

(limited to 'doc/source/command-objects')

diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst
index d2698b0b..8dce3662 100644
--- a/doc/source/command-objects/image.rst
+++ b/doc/source/command-objects/image.rst
@@ -238,6 +238,12 @@ Set image properties
         [--checksum <checksum>]
         [--stdin]
         [--property <key=value> [...] ]
+        [--architecture <architecture>]
+        [--instance-id <instance-id>]
+        [--kernel-id <kernel-id>]
+        [--os-distro <os-distro>]
+        [--os-version <os-version>]
+        [--ramdisk-id <ramdisk-id>]
         <image>
 
 .. option:: --name <name>
@@ -258,14 +264,11 @@ Set image properties
 
 .. option:: --container-format <container-format>
 
-    Container format of image.
-    Acceptable formats: ['ami', 'ari', 'aki', 'bare', 'ovf']
+    Image container format (default: bare)
 
 .. option:: --disk-format <disk-format>
 
-    Disk format of image.
-    Acceptable formats: ['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2',
-    'vdi', 'iso']
+    Image disk format (default: raw)
 
 .. option:: --size <size>
 
@@ -339,45 +342,41 @@ Set image properties
 
 .. option:: --property <key=value>
 
-    Set a property on this image (repeat for multiple values)
-
-    *Image version 1 only.*
+    Set a property on this image (repeat option to set multiple properties)
 
 .. option:: --architecture <architecture>
 
-    Operating system Architecture
+    Operating system architecture
 
     .. versionadded:: 2
 
-.. option:: --ramdisk-id <ramdisk-id>
+.. option:: --instance-id <instance-id>
 
-    ID of image stored in Glance that should be used as
-    the ramdisk when booting an AMI-style image
+    ID of server instance used to create this image
 
     .. versionadded:: 2
 
-.. option:: --os-distro <os-distro>
+.. option:: --kernel-id <kernel-id>
 
-    Common name of operating system distribution
+    ID of kernel image used to boot this disk image
 
     .. versionadded:: 2
 
-.. option:: --os-version <os-version>
+.. option:: --os-distro <os-distro>
 
-    Operating system version as specified by the distributor
+    Operating system distribution name
 
     .. versionadded:: 2
 
-.. option:: --kernel-id <kernel-id>
+.. option:: --os-version <os-version>
 
-    ID of image in Glance that should be used as the
-    kernel when booting an AMI-style image
+    Operating system distribution version
 
     .. versionadded:: 2
 
-.. option:: --instance-uuid <instance_uuid>
+.. option:: --ramdisk-id <ramdisk-id>
 
-    ID of instance used to create this image
+    ID of ramdisk image used to boot this disk image
 
     .. versionadded:: 2
 
-- 
cgit v1.2.1