Merge "Add support for configuring ppc64le in ironic"

This commit is contained in:
Zuul 2018-11-07 21:42:23 +00:00 committed by Gerrit Code Review
commit 86e79e047e
2 changed files with 23 additions and 0 deletions

@ -211,6 +211,10 @@ parameters:
MonitoringSubscriptionIronicConductor:
default: 'overcloud-ironic-conductor'
type: string
AdditionalArchitectures:
default: []
description: List of additional architectures to enable.
type: comma_delimited_list
resources:
IronicBase:
@ -234,6 +238,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:
@ -254,6 +259,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}

@ -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