openstack/ironic
Code Issues Proposed changes

Merge "Address comments on I5cc41932acd75cf5e9e5b626285331f97126932e"

Browse Source
This commit is contained in:
Jenkins 2015-04-09 18:40:58 +00:00 committed by Gerrit Code Review
commit dbc4834566
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ironic/drivers/modules/iscsi_deploy.py
View File

@ -449,6 +449,7 @@ def build_deploy_ramdisk_options(node):
# XXX(jroll) DIB relies on boot_option=local to decide whether or not to # XXX(jroll) DIB relies on boot_option=local to decide whether or not to
# lay down a bootloader. Hack this for now; fix it for real in Liberty. # lay down a bootloader. Hack this for now; fix it for real in Liberty.
# See also bug #1441556.
boot_option = get_boot_option(node) boot_option = get_boot_option(node)
if node.driver_internal_info.get('is_whole_disk_image'): if node.driver_internal_info.get('is_whole_disk_image'):
boot_option = 'netboot' boot_option = 'netboot'

5
ironic/tests/drivers/test_iscsi_deploy.py
View File

@ -487,8 +487,8 @@ class IscsiDeployMethodsTestCase(db_base.DbTestCase):
self._test_build_deploy_ramdisk_options(mock_alnum, fake_api_url, self._test_build_deploy_ramdisk_options(mock_alnum, fake_api_url,
expected_boot_option=expected) expected_boot_option=expected)
@mock.patch.object(keystone, 'get_service_url') @mock.patch.object(keystone, 'get_service_url', autospec=True)
@mock.patch.object(utils, 'random_alnum') @mock.patch.object(utils, 'random_alnum', autospec=True)
def test_build_deploy_ramdisk_options_whole_disk_image(self, mock_alnum, def test_build_deploy_ramdisk_options_whole_disk_image(self, mock_alnum,
mock_get_url): mock_get_url):
"""Tests a hack to boot_option for whole disk images. """Tests a hack to boot_option for whole disk images.
@ -499,6 +499,7 @@ class IscsiDeployMethodsTestCase(db_base.DbTestCase):
dii = self.node.driver_internal_info dii = self.node.driver_internal_info
dii['is_whole_disk_image'] = True dii['is_whole_disk_image'] = True
self.node.driver_internal_info = dii self.node.driver_internal_info = dii
self.node.save()
expected = 'netboot' expected = 'netboot'
fake_api_url = 'http://127.0.0.1:6385' fake_api_url = 'http://127.0.0.1:6385'
self.config(api_url=fake_api_url, group='conductor') self.config(api_url=fake_api_url, group='conductor')