Merge "Ironic role_specific parameters"

This commit is contained in:
Zuul 2020-09-04 00:38:26 +00:00 committed by Gerrit Code Review
commit 14aefe4ed4
1 changed files with 22 additions and 12 deletions

View File

@ -69,6 +69,8 @@ parameters:
created yet) and should be changed to an actual UUID in
a post-deployment stack update.
type: string
tags:
- role_specific
IronicDebug:
default: ''
description: Set to True to enable debugging Ironic services.
@ -210,6 +212,8 @@ parameters:
created yet) and should be changed to an actual UUID in
a post-deployment stack update.
type: string
tags:
- role_specific
IronicRescuingNetwork:
default: 'provisioning'
description: Name or UUID of the *overcloud* network used for resucing
@ -219,6 +223,8 @@ parameters:
created yet) and should be changed to an actual UUID in
a post-deployment stack update.
type: string
tags:
- role_specific
IronicForcePowerStateDuringSync:
default: true
description: Whether to force power state during sync.
@ -275,15 +281,22 @@ resources:
properties:
type: json
value:
map_replace:
- map_replace:
- if:
- ironic_conductor_group
- ironic::conductor::conductor_group: IronicConductorGroup
- {}
- values: {get_param: [RoleParameters]}
- values:
IronicConductorGroup: {get_param: IronicConductorGroup}
map_replace:
- map_replace:
- map_merge:
- if:
- ironic_conductor_group
- ironic::conductor::conductor_group: IronicConductorGroup
- {}
- ironic::conductor::cleaning_network: IronicCleaningNetwork
ironic::conductor::provisioning_network: IronicProvisioningNetwork
ironic::conductor::rescuing_network: IronicRescuingNetwork
- values: {get_param: [RoleParameters]}
- values:
IronicConductorGroup: {get_param: IronicConductorGroup}
IronicProvisioningNetwork: {get_param: IronicProvisioningNetwork}
IronicCleaningNetwork: {get_param: IronicCleaningNetwork}
IronicRescuingNetwork: {get_param: IronicRescuingNetwork}
ContainersCommon:
type: ../containers-common.yaml
@ -338,9 +351,6 @@ outputs:
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}
ironic::conductor::rescuing_network: {get_param: IronicRescuingNetwork}
ironic::conductor::default_boot_option: {get_param: IronicDefaultBootOption}
ironic::conductor::automated_clean: {get_param: IronicAutomatedClean}
ironic::conductor::enabled_hardware_types: {get_param: IronicEnabledHardwareTypes}