Merge "Allow configuring enabled hardware types for Ironic"
This commit is contained in:
commit
085d5009b6
|
@ -45,6 +45,10 @@ parameters:
|
||||||
default: ['pxe_ipmitool', 'pxe_drac', 'pxe_ilo']
|
default: ['pxe_ipmitool', 'pxe_drac', 'pxe_ilo']
|
||||||
description: Enabled Ironic drivers
|
description: Enabled Ironic drivers
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
|
IronicEnabledHardwareTypes:
|
||||||
|
default: ['ipmi']
|
||||||
|
description: Enabled Ironic hardware types
|
||||||
|
type: comma_delimited_list
|
||||||
IronicIPXEEnabled:
|
IronicIPXEEnabled:
|
||||||
default: true
|
default: true
|
||||||
description: Whether to use iPXE instead of PXE for deployment.
|
description: Whether to use iPXE instead of PXE for deployment.
|
||||||
|
@ -92,6 +96,7 @@ outputs:
|
||||||
ironic::conductor::cleaning_network: {get_param: IronicCleaningNetwork}
|
ironic::conductor::cleaning_network: {get_param: IronicCleaningNetwork}
|
||||||
ironic::conductor::provisioning_network: {get_param: IronicProvisioningNetwork}
|
ironic::conductor::provisioning_network: {get_param: IronicProvisioningNetwork}
|
||||||
ironic::conductor::enabled_drivers: {get_param: IronicEnabledDrivers}
|
ironic::conductor::enabled_drivers: {get_param: IronicEnabledDrivers}
|
||||||
|
ironic::conductor::enabled_hardware_types: {get_param: IronicEnabledHardwareTypes}
|
||||||
# We need an endpoint containing a real IP, not a VIP here
|
# We need an endpoint containing a real IP, not a VIP here
|
||||||
ironic_conductor_http_host: {get_param: [ServiceNetMap, IronicNetwork]}
|
ironic_conductor_http_host: {get_param: [ServiceNetMap, IronicNetwork]}
|
||||||
ironic::conductor::http_url:
|
ironic::conductor::http_url:
|
||||||
|
@ -112,6 +117,7 @@ outputs:
|
||||||
# NOTE(dtantsur): UEFI only works with iPXE currently for us
|
# NOTE(dtantsur): UEFI only works with iPXE currently for us
|
||||||
ironic::drivers::pxe::uefi_pxe_config_template: '$pybasedir/drivers/modules/ipxe_config.template'
|
ironic::drivers::pxe::uefi_pxe_config_template: '$pybasedir/drivers/modules/ipxe_config.template'
|
||||||
ironic::drivers::pxe::uefi_pxe_bootfile_name: 'ipxe.efi'
|
ironic::drivers::pxe::uefi_pxe_bootfile_name: 'ipxe.efi'
|
||||||
|
ironic::drivers::interfaces::enabled_console_interfaces: ['ipmitool-socat', 'no-console']
|
||||||
ironic::drivers::interfaces::enabled_network_interfaces: ['flat', 'neutron']
|
ironic::drivers::interfaces::enabled_network_interfaces: ['flat', 'neutron']
|
||||||
ironic::drivers::interfaces::default_network_interface: {get_param: IronicDefaultNetworkInterface}
|
ironic::drivers::interfaces::default_network_interface: {get_param: IronicDefaultNetworkInterface}
|
||||||
tripleo.ironic_conductor.firewall_rules:
|
tripleo.ironic_conductor.firewall_rules:
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Configuring enabled Ironic hardware types is now possible via new
|
||||||
|
``IronicEnabledHardwareTypes`` parameter. See this spec for details:
|
||||||
|
http://specs.openstack.org/openstack/ironic-specs/specs/approved/driver-composition-reform.html.
|
||||||
|
- |
|
||||||
|
Bare metal serial console support via ``socat`` utility is enabled for
|
||||||
|
Ironic hardware types supporting it (currently only ``ipmi``).
|
Loading…
Reference in New Issue