From 1d1c7a06311f49a8a1adfc2431871f686af18af4 Mon Sep 17 00:00:00 2001
From: Nicolas Simonds <nic@metacloud.com>
Date: Fri, 18 Mar 2016 16:04:07 -0700
Subject: [PATCH] Image API v2: make volume_type optional
It is perfectly valid for a Cinder volume to have a volume_type of
"none", so don't make the Image API v2 require that one be set.
Change-Id: I1a6da8d791fa0ae67cac46eec81bcbcb420729c3
Closes-Bug: #1559344
---
openstackclient/image/v2/image.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index 3f1621814c..40ddd4b9ce 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -325,7 +325,10 @@ class CreateImage(command.ShowOne):
parsed_args.disk_format,
)
info = body['os-volume_upload_image']
- info['volume_type'] = info['volume_type']['name']
+ try:
+ info['volume_type'] = info['volume_type']['name']
+ except TypeError:
+ info['volume_type'] = None
else:
image = image_client.images.create(**kwargs)