From 8faabb3bbaa199cce8a52d6e6ed40b15e4a3a000 Mon Sep 17 00:00:00 2001
From: NiallBunting <niall.bunting@hp.com>
Date: Tue, 22 Sep 2015 09:59:30 +0000
Subject: Glance `image set` Resolve Fracturing

Currently `image set` uses the new api, where other parts of osc the old
api is used. This deprecates the v2 api in favour of the v1 to maintain
the same commands across osc. However the functionality now remains
there as people could now be using this functionality.

This also adds the --unprotected argument, as in the previous version if
--protected was not supplied it would just make the argument
--unprotected without the users explicit consent.

The patch also fixes the documentation for image set as it was outdated.

Change-Id: I990d20332c80165102badef7ac94ddbeb7824950
Closes-Bug: 1498092
---
 doc/source/command-objects/image.rst | 60 +++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

(limited to 'doc/source/command-objects/image.rst')

diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst
index 25741424..b62f6e0b 100644
--- a/doc/source/command-objects/image.rst
+++ b/doc/source/command-objects/image.rst
@@ -193,7 +193,7 @@ Save an image locally
 image set
 ---------
 
-*Only supported for Image v1*
+*Image v1, v2*
 
 Set image properties
 
@@ -252,6 +252,8 @@ Set image properties
 
     Size of image data (in bytes)
 
+    *Image version 1 only.*
+
 .. option:: --protected
 
     Prevent image from being deleted
@@ -272,38 +274,94 @@ Set image properties
 
     Upload image to this store
 
+    *Image version 1 only.*
+
 .. option:: --location <image-url>
 
     Download image from an existing URL
 
+    *Image version 1 only.*
+
 .. option:: --copy-from <image-url>
 
     Copy image from the data store (similar to --location)
 
+    *Image version 1 only.*
+
 .. option:: --file <file>
 
     Upload image from local file
 
+    *Image version 1 only.*
+
 .. option:: --volume <volume>
 
     Update image with a volume
 
+    *Image version 1 only.*
+
 .. option:: --force
 
     Force image update if volume is in use (only meaningful with --volume)
 
+    *Image version 1 only.*
+
 .. option:: --checksum <checksum>
 
     Image hash used for verification
 
+    *Image version 1 only.*
+
 .. option:: --stdin
 
     Allow to read image data from standard input
 
+    *Image version 1 only.*
+
 .. option:: --property <key=value>
 
     Set a property on this image (repeat for multiple values)
 
+    *Image version 1 only.*
+
+.. option:: --architecture <architecture>
+
+    Operating system Architecture
+
+    .. versionadded:: 2
+
+.. option:: --ramdisk-id <ramdisk-id>
+
+    ID of image stored in Glance that should be used as
+    the ramdisk when booting an AMI-style image
+
+    .. versionadded:: 2
+
+.. option:: --os-distro <os-distro>
+
+    Common name of operating system distribution
+
+    .. versionadded:: 2
+
+.. option:: --os-version <os-version>
+
+    Operating system version as specified by the distributor
+
+    .. versionadded:: 2
+
+.. option:: --kernel-id <kernel-id>
+
+    ID of image in Glance that should be used as the
+    kernel when booting an AMI-style image
+
+    .. versionadded:: 2
+
+.. option:: --instance-uuid <instance_uuid>
+
+    ID of instance used to create this image
+
+    .. versionadded:: 2
+
 .. describe:: <image>
 
     Image to modify (name or ID)
-- 
cgit v1.2.1