openstack/ironic
Code Issues Proposed changes

Merge "Add 'iscsi' deploy support for 'ilo' hardware type"

Browse Source
This commit is contained in:
Jenkins 2017-05-09 22:42:02 +00:00 committed by Gerrit Code Review
commit d19e8c39f7
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ironic/drivers/ilo.py
View File

@ -45,23 +45,6 @@ class IloHardware(generic.GenericHardware):
"""List of supported boot interfaces."""
return [boot.IloVirtualMediaBoot, boot.IloPXEBoot]
@property
def supported_deploy_interfaces(self):
"""List of supported deploy interfaces."""
# Note(stendulker) It does not support ISCSI based deploy
# (iscsi.ISCSIDeploy) mechanism.
# The reason being all the Ironic features supported by ISCSIDeploy
# are supported with agentDeploy as well. There is no additional
# advantage of having iscsi based deploy except for the cases wherein
# instance images(qcow2) are larger than RAM size of the bare metal.
# That also could be overcome by using 'raw' images.
# To avoid the additional driver supportability and reduce test matrix,
# ISCSI based deploy is not supported. However, if any user insists
# for ISCSI based deploy, we would surely enable the same.
return [agent.AgentDeploy]
@property
def supported_console_interfaces(self):
"""List of supported console interfaces."""

7
ironic/tests/unit/drivers/test_ilo.py
View File

@ -43,7 +43,7 @@ class IloHardwareTestCase(db_base.DbTestCase):
self.config(enabled_hardware_types=['ilo'],
enabled_boot_interfaces=['ilo-virtual-media', 'ilo-pxe'],
enabled_console_interfaces=['ilo'],
enabled_deploy_interfaces=['direct'],
enabled_deploy_interfaces=['iscsi', 'direct'],
enabled_inspect_interfaces=['ilo'],
enabled_management_interfaces=['ilo'],
enabled_power_interfaces=['ilo'],
@ -59,7 +59,7 @@ class IloHardwareTestCase(db_base.DbTestCase):
self.assertIsInstance(task.driver.console,
ilo.console.IloConsoleInterface)
self.assertIsInstance(task.driver.deploy,
agent.AgentDeploy)
iscsi_deploy.ISCSIDeploy)
self.assertIsInstance(task.driver.inspect,
ilo.inspect.IloInspect)
self.assertIsInstance(task.driver.management,
@ -99,7 +99,6 @@ class IloHardwareTestCase(db_base.DbTestCase):
def test_override_with_pxe(self):
node = obj_utils.create_test_node(
self.context, driver='ilo',
deploy_interface='direct',
boot_interface='ilo-pxe',
raid_interface='agent')
with task_manager.acquire(self.context, node.id) as task:
@ -108,7 +107,7 @@ class IloHardwareTestCase(db_base.DbTestCase):
self.assertIsInstance(task.driver.console,
ilo.console.IloConsoleInterface)
self.assertIsInstance(task.driver.deploy,
agent.AgentDeploy)
iscsi_deploy.ISCSIDeploy)
self.assertIsInstance(task.driver.inspect,
ilo.inspect.IloInspect)
self.assertIsInstance(task.driver.management,

4
releasenotes/notes/iscsi-deploy-support-for-ilo-hardware-type-bdfdce76cc265867.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Adds support for ``iscsi`` deploy interface for ``ilo`` hardware type.