openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Remove iscsi from IronicEnabledDeployInterfaces"

This commit is contained in:
Zuul 2021-06-10 11:21:18 +00:00 committed by Gerrit Code Review
parent 44783430ec 0f0352a5b8
commit 35b1586edc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
'IronicEnabledHardwareTypes': ['ipmi', 'redfish', 'ilo', 'idrac'], 'IronicEnabledHardwareTypes': ['ipmi', 'redfish', 'ilo', 'idrac'],
'IronicEnabledBootInterfaces': ['ipxe', 'pxe', 'ilo-pxe'], 'IronicEnabledBootInterfaces': ['ipxe', 'pxe', 'ilo-pxe'],
'IronicEnabledBiosInterfaces': ['no-bios', 'ilo', 'redfish'], 'IronicEnabledBiosInterfaces': ['no-bios', 'ilo', 'redfish'],
'IronicEnabledDeployInterfaces': ['direct', 'iscsi', 'ansible'], 'IronicEnabledDeployInterfaces': ['direct', 'ansible'],
'IronicEnabledInspectInterfaces': ['inspector', 'no-inspect', 'IronicEnabledInspectInterfaces': ['inspector', 'no-inspect',
'redfish', 'idrac', 'ilo'], 'redfish', 'idrac', 'ilo'],
'IronicEnabledManagementInterfaces': ['ipmitool', 'redfish', 'IronicEnabledManagementInterfaces': ['ipmitool', 'redfish',
@ -81,7 +81,7 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
'IronicEnabledHardwareTypes': ['redfish', 'ipmi'], 'IronicEnabledHardwareTypes': ['redfish', 'ipmi'],
'IronicEnabledBootInterfaces': ['ipxe', 'pxe'], 'IronicEnabledBootInterfaces': ['ipxe', 'pxe'],
'IronicEnabledBiosInterfaces': ['no-bios', 'redfish'], 'IronicEnabledBiosInterfaces': ['no-bios', 'redfish'],
'IronicEnabledDeployInterfaces': ['direct', 'iscsi', 'ansible'], 'IronicEnabledDeployInterfaces': ['direct', 'ansible'],
'IronicEnabledInspectInterfaces': ['inspector', 'no-inspect', 'IronicEnabledInspectInterfaces': ['inspector', 'no-inspect',
'redfish'], 'redfish'],
'IronicEnabledManagementInterfaces': ['ipmitool', 'redfish', 'IronicEnabledManagementInterfaces': ['ipmitool', 'redfish',
@ -112,7 +112,7 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
'irmc-pxe', 'fake'], 'irmc-pxe', 'fake'],
'IronicEnabledBiosInterfaces': ['no-bios', 'ilo', 'irmc', 'IronicEnabledBiosInterfaces': ['no-bios', 'ilo', 'irmc',
'redfish'], 'redfish'],
'IronicEnabledDeployInterfaces': ['direct', 'iscsi', 'ansible', 'IronicEnabledDeployInterfaces': ['direct', 'ansible',
'fake'], 'fake'],
'IronicEnabledInspectInterfaces': ['inspector', 'no-inspect', 'IronicEnabledInspectInterfaces': ['inspector', 'no-inspect',
'redfish', 'idrac', 'ilo', 'redfish', 'idrac', 'ilo',

2
tripleoclient/v1/undercloud_config.py
View File

@ -186,7 +186,7 @@ def _process_drivers_and_hardware_types(conf, env):
if 'snmp' in enabled_hardware_types: if 'snmp' in enabled_hardware_types:
power_interfaces.append('snmp') power_interfaces.append('snmp')
deploy_interfaces = ['direct', 'iscsi', 'ansible'] deploy_interfaces = ['direct', 'ansible']
if 'fake-hardware' in enabled_hardware_types: if 'fake-hardware' in enabled_hardware_types:
deploy_interfaces.append('fake') deploy_interfaces.append('fake')
boot_interfaces.append('fake') boot_interfaces.append('fake')