Merge "Fix block-device-mapping when volume_size is empty"

Jenkins · openstack-gerrit · commit e2cd971a03ed · 2017-04-03T19:49:42.000Z
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
@@ -544,7 +544,7 @@ def take_action(self, parsed_args):
                     else:
                         mapping['source_type'] = 'volume'
                     mapping['destination_type'] = 'volume'
-                    if len(dev_map) > 2:
+                    if len(dev_map) > 2 and dev_map[2]:
                         mapping['volume_size'] = dev_map[2]
                     if len(dev_map) > 3:
                         mapping['delete_on_termination'] = dev_map[3]
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -817,8 +817,7 @@ def test_server_create_with_block_device_mapping(self):
                 'uuid': real_volume_mapping.split(':', 1)[0],
                 'destination_type': 'volume',
                 'source_type': 'volume',
-                'delete_on_termination': '0',
-                'volume_size': ''
+                'delete_on_termination': '0'
             }],
             nics=[],
             scheduler_hints={},
diff --git a/releasenotes/notes/bug-1677236-7de9d11c3f0fb5ed.yaml b/releasenotes/notes/bug-1677236-7de9d11c3f0fb5ed.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fix creating a server with a block-device-mapping when volume_size
+    is empty.
+    [Bug `1677236 <https://bugs.launchpad.net/bugs/1652827>`_]
