Browse Source

Merge "Remove iscsi from IronicEnabledDeployInterfaces"

changes/25/795925/1
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
35b1586edc
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      tripleoclient/tests/v1/undercloud/test_config.py
  2. +1
    -1
      tripleoclient/v1/undercloud_config.py

+ 3
- 3
tripleoclient/tests/v1/undercloud/test_config.py View File

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


+ 1
- 1
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:
power_interfaces.append('snmp')
deploy_interfaces = ['direct', 'iscsi', 'ansible']
deploy_interfaces = ['direct', 'ansible']
if 'fake-hardware' in enabled_hardware_types:
deploy_interfaces.append('fake')
boot_interfaces.append('fake')


Loading…
Cancel
Save