openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Make IronicConductorGroup role_specific"

Browse Source
This commit is contained in:
Zuul 2020-05-28 05:19:48 +00:00 committed by Gerrit Code Review
commit b58bbe6493
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
deployment/ironic/ironic-conductor-container-puppet.yaml
View File

@ -227,6 +227,8 @@ parameters:
description: The name of an Ironic Conductor Group. description: The name of an Ironic Conductor Group.
default: '' default: ''
type: string type: string
tags:
- role_specific
constraints: constraints:
- allowed_pattern: '^[a-zA-Z0-9_\-\.]*$' - allowed_pattern: '^[a-zA-Z0-9_\-\.]*$'
MonitoringSubscriptionIronicConductor: MonitoringSubscriptionIronicConductor:
@ -262,9 +264,26 @@ conditions:
- equals: [{get_param: Debug}, true] - equals: [{get_param: Debug}, true]
enable_architecture_ppc64le: {contains: ['ppc64le', {get_param: AdditionalArchitectures}]} enable_architecture_ppc64le: {contains: ['ppc64le', {get_param: AdditionalArchitectures}]}
configure_swift_temp_url: {equals: [{get_param: IronicConfigureSwiftTempUrlKey}, true]} configure_swift_temp_url: {equals: [{get_param: IronicConfigureSwiftTempUrlKey}, true]}
ironic_conductor_group: {not: {equals: [{get_param: IronicConductorGroup}, '']}} ironic_conductor_group:
or:
- not: {equals: [{get_param: IronicConductorGroup}, '']}
- not: {equals: [{get_param: [RoleParameters, IronicConductorGroup]}, '']}
resources: resources:
RoleParametersValue:
type: OS::Heat::Value
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}
ContainersCommon: ContainersCommon:
type: ../containers-common.yaml type: ../containers-common.yaml
@ -299,6 +318,7 @@ outputs:
config_settings: config_settings:
map_merge: map_merge:
- get_attr: [IronicBase, role_data, config_settings] - get_attr: [IronicBase, role_data, config_settings]
- get_attr: [RoleParametersValue, value]
- -
if: if:
- default_deploy_interface_unset - default_deploy_interface_unset
@ -455,11 +475,6 @@ outputs:
- ironic::pxe::tftp_root: /var/lib/ironic/tftpboot - ironic::pxe::tftp_root: /var/lib/ironic/tftpboot
- ironic::pxe::http_root: /var/lib/ironic/httpboot - ironic::pxe::http_root: /var/lib/ironic/httpboot
- ironic::conductor::http_root: /var/lib/ironic/httpboot - ironic::conductor::http_root: /var/lib/ironic/httpboot
-
if:
- ironic_conductor_group
- ironic::conductor::conductor_group: {get_param: IronicConductorGroup}
- {}
service_config_settings: {} service_config_settings: {}
# BEGIN DOCKER SETTINGS # BEGIN DOCKER SETTINGS
puppet_config: puppet_config: