diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-21 21:20:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-21 21:20:25 +0000 |
| commit | 59ffee26a673ba6f217eb261359e69de32522c5d (patch) | |
| tree | 71cbe0f1d10f5719604af00b3e0f9962bd3c426c /openstackclient | |
| parent | 0a65e8df702b242275188aeb4a81c40358bb7a39 (diff) | |
| parent | 1d1c7a06311f49a8a1adfc2431871f686af18af4 (diff) | |
| download | python-openstackclient-59ffee26a673ba6f217eb261359e69de32522c5d.tar.gz | |
Merge "Image API v2: make volume_type optional"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/image/v2/image.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py index 3f162181..40ddd4b9 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) |