Add support for configuring ppc64le in ironic

Change-Id: Id9688f938cf601508b5f514b0e00fae658764402
(cherry picked from commit 1697a3f867)
This commit is contained in:
Tony Breeds 2018-07-06 12:01:03 +10:00
parent 699ea41bb0
commit 76cd5845ae
2 changed files with 23 additions and 0 deletions

View File

@ -205,6 +205,10 @@ parameters:
MonitoringSubscriptionIronicConductor:
default: 'overcloud-ironic-conductor'
type: string
AdditionalArchitectures:
default: []
description: List of additional architectures to enable.
type: comma_delimited_list
resources:
IronicBase:
@ -228,6 +232,7 @@ conditions:
- equals: [{get_param: IronicDebug}, 'True']
- equals: [{get_param: IronicDebug}, 'TRUE']
- equals: [{get_param: Debug}, true]
enable_architecture_ppc64le: {contains: ['ppc64le', {get_param: AdditionalArchitectures}]}
outputs:
role_data:
@ -248,6 +253,14 @@ outputs:
- default_inspect_interface_unset
- {}
- ironic::drivers::interfaces::default_inspect_interface: {get_param: IronicDefaultInspectInterface}
-
if:
- enable_architecture_ppc64le
- ironic::pxe::enable_ppc64le: true
ironic::conductor::power_state_change_timeout: 60
ironic::drivers::ipmi::command_retry_timeout: 120
ironic::drivers::ipmi::min_command_interval: 15
- {}
- ironic::conductor::cleaning_disk_erase: {get_param: IronicCleaningDiskErase}
ironic::conductor::cleaning_network: {get_param: IronicCleaningNetwork}
ironic::conductor::provisioning_network: {get_param: IronicProvisioningNetwork}

View File

@ -120,12 +120,17 @@ parameters:
description: The password for the Ironic service and db account, used by the Ironic services
type: string
hidden: true
AdditionalArchitectures:
default: []
description: List of additional architectures to enable.
type: comma_delimited_list
conditions:
enable_ipxe: {equals : [{get_param: IronicInspectorIPXEEnabled}, true]}
use_swift: {equals : [{get_param: IronicInspectorUseSwift}, true]}
enable_node_discovery: {equals : [{get_param: IronicInspectorEnableNodeDiscovery}, true]}
ironic_inspection_subnets_not_set: {equals : [{get_param: IronicInspectorSubnets}, {}]}
enable_architecture_ppc64le: {contains: ['ppc64le', {get_param: AdditionalArchitectures}]}
outputs:
role_data:
@ -205,6 +210,11 @@ outputs:
- {get_param: [EndpointMap, MysqlInternal, host]}
- '/ironic-inspector'
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
-
if:
- enable_architecture_ppc64le
- ironic::inspector::enable_ppc64le: true
- {}
-
if:
- enable_ipxe