openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Designate: format listen addr properly when ipv6"

Browse Source
This commit is contained in:
Zuul 2022-10-04 07:41:19 +00:00 committed by Gerrit Code Review
commit 2b47459f5b
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deployment/designate/designate-mdns-container-puppet.yaml
View File

@ -67,6 +67,10 @@ parameters:
conditions: conditions:
designate_workers_zero: {equals : [{get_param: DesignateWorkers}, 0]} designate_workers_zero: {equals : [{get_param: DesignateWorkers}, 0]}
enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]} enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}
is_ipv6:
equals:
- {get_param: [ServiceData, net_ip_version_map, {get_param: [ServiceNetMap, DesignateMdnsNetwork]}]}
- 6
resources: resources:
@ -126,7 +130,14 @@ outputs:
map_merge: map_merge:
- get_attr: [DesignateBase, role_data, config_settings] - get_attr: [DesignateBase, role_data, config_settings]
- designate::mdns::listen: - designate::mdns::listen:
str_replace: if:
- is_ipv6
- str_replace:
template:
"[%{lookup('$NETWORK')}]:5354"
params:
$NETWORK: {get_param: [ServiceNetMap, DesignateMdnsNetwork]}
- str_replace:
template: template:
"%{lookup('$NETWORK')}:5354" "%{lookup('$NETWORK')}:5354"
params: params: