openstack/openstack-virtual-baremetal
Code Issues Proposed changes

Correctly retrieve disk size for boot from volume

Browse Source 
Previously the flavor size was used unconditionally, which in the
boot from volume case would generally be incorrect.  This is
particularly problematic with flavors of a 0 disk size that can only
be used with boot from volume as the resulting Ironic nodes appear
to have no storage.

This change adds functionality to look up the volume size if we
detect that a baremetal instance was booted from volume.
This commit is contained in:
Ben Nemec 2018-01-30 16:58:15 -06:00
parent dad1859b67
commit e051d91fd9
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_virtual_baremetal/build_nodes_json.py
View File

@ -164,6 +164,14 @@ def _build_nodes(nova, glance, bmc_ports, bm_ports, provision_net,
image = cache.get(baremetal.image['id'])
if image.get('hw_firmware_type') == 'uefi':
node['capabilities'] += ",boot_mode:uefi"
else:
# With boot from volume the flavor disk size doesn't matter. We
# need to look up the volume disk size.
cloud = os.environ.get('OS_CLOUD')
cinder = os_client_config.make_client('volume', cloud=cloud)
vol_id = baremetal.to_dict()['os-extended-volumes:volumes_attached'][0]['id']
volume = cinder.volumes.get(vol_id)
node['disk'] = volume.size
bm_name_end = baremetal.name[len(baremetal_base):]
if '-' in bm_name_end:

15
openstack_virtual_baremetal/tests/test_build_nodes_json.py
View File

@ -262,7 +262,8 @@ class TestBuildNodesJson(testtools.TestCase):
mock_flavor.disk = 1024
nova.flavors.get.return_value = mock_flavor
def test_build_nodes(self):
@mock.patch('os_client_config.make_client')
def test_build_nodes(self, mock_make_client):
bmc_ports = [{'fixed_ips': [{'ip_address': '1.1.1.1'}]},
{'fixed_ips': [{'ip_address': '1.1.1.2'}]}
]
@ -270,6 +271,15 @@ class TestBuildNodesJson(testtools.TestCase):
nova = mock.Mock()
servers = [mock.Mock(), mock.Mock(), mock.Mock()]
self._create_build_nodes_mocks(nova, servers)
servers[1].image = None
mock_to_dict = {'os-extended-volumes:volumes_attached':
[{'id': 'v0lume'}]}
servers[1].to_dict.return_value = mock_to_dict
mock_cinder = mock.Mock()
mock_make_client.return_value = mock_cinder
mock_vol = mock.Mock()
mock_vol.size = 100
mock_cinder.volumes.get.return_value = mock_vol
servers[2].name = 'undercloud'
servers[2].flavor = {'id': '1'}
servers[2].addresses = {'provision': [{'OS-EXT-IPS-MAC:mac_addr':
@ -286,7 +296,8 @@ class TestBuildNodesJson(testtools.TestCase):
extra_nodes,
network_details) = build_nodes_json._build_nodes(
nova, glance, bmc_ports, bm_ports, 'provision', 'bm', 'undercloud')
expected_nodes = TEST_NODES
expected_nodes = copy.deepcopy(TEST_NODES)
expected_nodes[1]['disk'] = 100
self.assertEqual(expected_nodes, nodes)
self.assertEqual([('1.1.1.1', 'bm_0'), ('1.1.1.2', 'bm_1')],
bmc_bm_pairs)