openstack/python-novaclient
Code Issues Proposed changes

Merge "Remove image to local block device mapping"

Browse Source
This commit is contained in:
Jenkins 2015-02-06 23:04:42 +00:00 committed by Gerrit Code Review
commit 91e9068305
2 changed files with 0 additions and 14 deletions
novaclient
tests/unit/v2
test_shell.py
v2
servers.py

7
novaclient/tests/unit/v2/test_shell.py

@ -292,13 +292,6 @@ class ShellTest(utils.TestCase):
'flavorRef': '1',
'name': 'some-server',
'block_device_mapping_v2': [
{
'uuid': 1,
'source_type': 'image',
'destination_type': 'local',
'boot_index': 0,
'delete_on_termination': True,
},
{
'uuid': 'fake-id',
'source_type': 'volume',

7
novaclient/v2/servers.py

@ -526,13 +526,6 @@ class ServerManager(base.BootingManagerWithFind):
body['server']['block_device_mapping'] = \
self._parse_block_device_mapping(block_device_mapping)
elif block_device_mapping_v2:
# Append the image to the list only if we have new style BDMs
if image:
bdm_dict = {'uuid': image.id, 'source_type': 'image',
'destination_type': 'local', 'boot_index': 0,
'delete_on_termination': True}
block_device_mapping_v2.insert(0, bdm_dict)
body['server']['block_device_mapping_v2'] = block_device_mapping_v2
if nics is not None: