From 63377f25fc7dfae151bab2f6e82002a9a1944e93 Mon Sep 17 00:00:00 2001
From: Mikhail Feoktistov <mfeoktistov@virtuozzo.com>
Date: Thu, 15 Dec 2016 19:29:55 +0300
Subject: [PATCH] Add ploop to supported disk formats
This format is used for containers for Virtuozzo hypervisor
Closes-Bug: 1650342
Change-Id: Ic79f29a1fe9ea5016d3d5520c2b06e39da01ff61
---
doc/source/command-objects/image.rst | 4 ++--
openstackclient/image/v1/image.py | 2 +-
openstackclient/image/v2/image.py | 2 +-
releasenotes/notes/bug-1650342-22cb88ef37a41872.yaml | 5 +++++
4 files changed, 9 insertions(+), 4 deletions(-)
create mode 100644 releasenotes/notes/bug-1650342-22cb88ef37a41872.yaml
diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst
index 7fc33c697c..9564f099e6 100644
--- a/doc/source/command-objects/image.rst
+++ b/doc/source/command-objects/image.rst
@@ -79,7 +79,7 @@ Create/upload an image
.. option:: --disk-format <disk-format>
Image disk format. The supported options are: ami, ari, aki, vhd, vmdk,
- raw, qcow2, vhdx, vdi, and iso. The default format is: raw
+ raw, qcow2, vhdx, vdi, iso, and ploop. The default format is: raw
.. option:: --size <size>
@@ -339,7 +339,7 @@ Set image properties
.. option:: --disk-format <disk-format>
Image disk format. The supported options are: ami, ari, aki, vhd, vmdk,
- raw, qcow2, vhdx, vdi, and iso.
+ raw, qcow2, vhdx, vdi, iso, and ploop.
.. option:: --size <size>
diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index eb79cd2fed..1f239b6701 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -39,7 +39,7 @@ from openstackclient.i18n import _
DEFAULT_CONTAINER_FORMAT = 'bare'
DEFAULT_DISK_FORMAT = 'raw'
DISK_CHOICES = ["ami", "ari", "aki", "vhd", "vmdk", "raw", "qcow2", "vhdx",
- "vdi", "iso"]
+ "vdi", "iso", "ploop"]
LOG = logging.getLogger(__name__)
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index 1d16760556..55eb7eb104 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -33,7 +33,7 @@ from openstackclient.identity import common
DEFAULT_CONTAINER_FORMAT = 'bare'
DEFAULT_DISK_FORMAT = 'raw'
DISK_CHOICES = ["ami", "ari", "aki", "vhd", "vmdk", "raw", "qcow2", "vhdx",
- "vdi", "iso"]
+ "vdi", "iso", "ploop"]
LOG = logging.getLogger(__name__)
diff --git a/releasenotes/notes/bug-1650342-22cb88ef37a41872.yaml b/releasenotes/notes/bug-1650342-22cb88ef37a41872.yaml
new file mode 100644
index 0000000000..345d683125
--- /dev/null
+++ b/releasenotes/notes/bug-1650342-22cb88ef37a41872.yaml
@@ -0,0 +1,5 @@
+---
+features:
+ - Add ``ploop`` as a valid disk format choice for ``image create``
+ and ``image set`` commands.
+ [Bug `1650342 <https://bugs.launchpad.net/bugs/1650342>`_]