openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Undercloud: support bios interface for ilo, irmc, redfish"

This commit is contained in:
Zuul 2019-01-11 18:08:27 +00:00 committed by Gerrit Code Review
parent e484c48764 f20e47c9e8
commit 0d9ac70c03
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/tests/v1/undercloud/test_config.py
View File

@ -49,6 +49,7 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
self.assertEqual({
'IronicEnabledHardwareTypes': ['idrac', 'ilo', 'ipmi', 'redfish'],
'IronicEnabledBootInterfaces': ['ilo-pxe', 'ipxe', 'pxe'],
'IronicEnabledBiosInterfaces': ['ilo', 'no-bios', 'redfish'],
'IronicEnabledManagementInterfaces': ['fake', 'idrac', 'ilo',
'ipmitool', 'noop',
'redfish'],
@ -68,6 +69,7 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
# ipmi added because it's the default discovery driver
'IronicEnabledHardwareTypes': ['ipmi', 'redfish'],
'IronicEnabledBootInterfaces': ['ipxe', 'pxe'],
'IronicEnabledBiosInterfaces': ['no-bios', 'redfish'],
'IronicEnabledManagementInterfaces': ['fake', 'ipmitool',
'noop', 'redfish'],
'IronicEnabledPowerInterfaces': ['fake', 'ipmitool', 'redfish'],
@ -95,6 +97,8 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
'xclarity'],
'IronicEnabledBootInterfaces': ['ilo-pxe', 'ipxe', 'irmc-pxe',
'pxe'],
'IronicEnabledBiosInterfaces': ['ilo', 'irmc',
'no-bios', 'redfish'],
'IronicEnabledManagementInterfaces': ['cimc', 'fake', 'idrac',
'ilo', 'ipmitool', 'irmc',
'noop', 'redfish',

6
tripleoclient/v1/undercloud_config.py
View File

@ -155,6 +155,11 @@ def _process_drivers_and_hardware_types(conf, env):
if hw_type in enabled_hardware_types:
mgmt_interfaces.add(iface)
bios_interfaces = {'no-bios'}
for hw_type in ['ilo', 'irmc', 'redfish']:
if hw_type in enabled_hardware_types:
bios_interfaces.add(hw_type)
# Two hardware types use non-default boot interfaces.
boot_interfaces = {'ipxe', 'pxe'}
for hw_type in ('ilo', 'irmc'):
@ -180,6 +185,7 @@ def _process_drivers_and_hardware_types(conf, env):
env['IronicEnabledHardwareTypes'] = sorted(enabled_hardware_types)
env['IronicEnabledBiosInterfaces'] = sorted(bios_interfaces)
env['IronicEnabledBootInterfaces'] = sorted(boot_interfaces)
env['IronicEnabledManagementInterfaces'] = sorted(mgmt_interfaces)
env['IronicEnabledPowerInterfaces'] = sorted(power_interfaces)