Merge "bnr enabled ramdisk as deploy interfaces on the ironic/undercloud"
This commit is contained in:
commit
b5083e0bc0
|
@ -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', 'ansible'],
|
'IronicEnabledDeployInterfaces': ['direct', 'ansible', 'ramdisk'],
|
||||||
'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', 'ansible'],
|
'IronicEnabledDeployInterfaces': ['direct', 'ansible', 'ramdisk'],
|
||||||
'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', 'ansible',
|
'IronicEnabledDeployInterfaces': ['direct', 'ansible', 'ramdisk',
|
||||||
'fake'],
|
'fake'],
|
||||||
'IronicEnabledInspectInterfaces': ['inspector', 'no-inspect',
|
'IronicEnabledInspectInterfaces': ['inspector', 'no-inspect',
|
||||||
'redfish', 'idrac', 'ilo',
|
'redfish', 'idrac', 'ilo',
|
||||||
|
|
|
@ -184,7 +184,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', 'ansible']
|
deploy_interfaces = ['direct', 'ansible', 'ramdisk']
|
||||||
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')
|
||||||
|
|
Loading…
Reference in New Issue