diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-13 16:44:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-13 16:44:44 +0000 |
| commit | 5243b093caa4d041d2367e7e2bd733f8580e4a2c (patch) | |
| tree | 9197ac4ef0613e8b1469434bca8240a6af03bc5d /openstackclient/compute/v2/server.py | |
| parent | 51f2fda0417b391051743038de9f979ed4190127 (diff) | |
| parent | 8b23c2690c90a6cafc58f8a72f04c8e33234ce37 (diff) | |
| download | python-openstackclient-5243b093caa4d041d2367e7e2bd733f8580e4a2c.tar.gz | |
Merge "Split the vol_id from a dev mapping"
Diffstat (limited to 'openstackclient/compute/v2/server.py')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index b5e7f004..ef9d24e7 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -425,10 +425,17 @@ class CreateServer(show.ShowOne): dev_key, dev_vol = dev_map.split('=', 1) block_volume = None if dev_vol: - block_volume = utils.find_resource( - volume_client.volumes, - dev_vol, - ).id + vol = dev_vol.split(':', 1)[0] + if vol: + vol_id = utils.find_resource( + volume_client.volumes, + vol, + ).id + block_volume = dev_vol.replace(vol, vol_id) + else: + msg = _("Volume name or ID must be specified if " + "--block-device-mapping is specified") + raise exceptions.CommandError(msg) block_device_mapping.update({dev_key: block_volume}) nics = [] |