diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-09 18:40:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-09 18:40:58 +0000 |
| commit | dbc4834566f0dea05f33c6acd8c792164ff163b5 (patch) | |
| tree | 66b16929e735d1fe13a32dc473906fec43e649b9 | |
| parent | 453d5e422625936a33d067fb99a4378444054744 (diff) | |
| parent | 5cdde4275bfef18ddda54d2d5888c9d7edc82c39 (diff) | |
| download | ironic-dbc4834566f0dea05f33c6acd8c792164ff163b5.tar.gz | |
Merge "Address comments on I5cc41932acd75cf5e9e5b626285331f97126932e"
| -rw-r--r-- | ironic/drivers/modules/iscsi_deploy.py | 1 | ||||
| -rw-r--r-- | ironic/tests/drivers/test_iscsi_deploy.py | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ironic/drivers/modules/iscsi_deploy.py b/ironic/drivers/modules/iscsi_deploy.py index 352cfb977..220e204a3 100644 --- a/ironic/drivers/modules/iscsi_deploy.py +++ b/ironic/drivers/modules/iscsi_deploy.py @@ -449,6 +449,7 @@ def build_deploy_ramdisk_options(node): # 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. + # See also bug #1441556. boot_option = get_boot_option(node) if node.driver_internal_info.get('is_whole_disk_image'): boot_option = 'netboot' diff --git a/ironic/tests/drivers/test_iscsi_deploy.py b/ironic/tests/drivers/test_iscsi_deploy.py index 39e72091e..4d3803542 100644 --- a/ironic/tests/drivers/test_iscsi_deploy.py +++ b/ironic/tests/drivers/test_iscsi_deploy.py @@ -487,8 +487,8 @@ class IscsiDeployMethodsTestCase(db_base.DbTestCase): self._test_build_deploy_ramdisk_options(mock_alnum, fake_api_url, expected_boot_option=expected) - @mock.patch.object(keystone, 'get_service_url') - @mock.patch.object(utils, 'random_alnum') + @mock.patch.object(keystone, 'get_service_url', autospec=True) + @mock.patch.object(utils, 'random_alnum', autospec=True) def test_build_deploy_ramdisk_options_whole_disk_image(self, mock_alnum, mock_get_url): """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['is_whole_disk_image'] = True self.node.driver_internal_info = dii + self.node.save() expected = 'netboot' fake_api_url = 'http://127.0.0.1:6385' self.config(api_url=fake_api_url, group='conductor') |