Merge "Move update code from image create command"

2 files changed, 54 insertions, 0 deletions

diff --git a/doc/source/backwards-incompatible.rst b/doc/source/backwards-incompatible.rst
index 437f9324..ae77164b 100644
--- a/doc/source/backwards-incompatible.rst
+++ b/doc/source/backwards-incompatible.rst
@@ -47,6 +47,20 @@ List of Backwards Incompatible Changes
   * Bug: https://bugs.launchpad.net/python-openstackclient/+bug/1450872
   * Commit: https://review.openstack.org/#/c/179446/
 
+4. Command `openstack image create` does not update already existing image
+
+  Previously, the image create command updated already existing image if it had
+  same name. It disabled possibility to create multiple images with same name
+  and lead to potentially unwanted update of existing images by image create
+  command.
+  Now, update code was moved from create action to set action.
+
+  * In favor of: Create multiple images with same name (as glance does).
+  * As of: 1.5.0
+  * Removed in: NA
+  * Bug: https://bugs.launchpad.net/python-openstackclient/+bug/1461817
+  * Commit: https://review.openstack.org/#/c/194654/
+
 For Developers
 ==============
 
diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst
index 18658651..824d4930 100644
--- a/doc/source/command-objects/image.rst
+++ b/doc/source/command-objects/image.rst
@@ -210,6 +210,14 @@ Set image properties
         [--size <size>]
         [--protected | --unprotected]
         [--public | --private]
+        [--store <store>]
+        [--location <image-url>]
+        [--copy-from <image-url>]
+        [--file <file>]
+        [--volume <volume>]
+        [--force]
+        [--checksum <checksum>]
+        [--stdin]
         [--property <key=value> [...] ]
         <image>
 
@@ -260,6 +268,38 @@ Set image properties
 
     Image is inaccessible to the public (default)
 
+.. option:: --store <store>
+
+    Upload image to this store
+
+.. option:: --location <image-url>
+
+    Download image from an existing URL
+
+.. option:: --copy-from <image-url>
+
+    Copy image from the data store (similar to --location)
+
+.. option:: --file <file>
+
+    Upload image from local file
+
+.. option:: --volume <volume>
+
+    Update image with a volume
+
+.. option:: --force
+
+    Force image update if volume is in use (only meaningful with --volume)
+
+.. option:: --checksum <checksum>
+
+    Image hash used for verification
+
+.. option:: --stdin
+
+    Allow to read image data from standard input
+
 .. option:: --property <key=value>
 
     Set a property on this image (repeat for multiple values)