openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add map merge strategy for {{role.name}}Parameters"

This commit is contained in:
Zuul 2021-06-15 21:59:36 +00:00 committed by Gerrit Code Review
parent 3eb7ce20c1 1eea4ca2eb
commit 35138d27f8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
overcloud-resource-registry-puppet.j2.yaml
View File

@ -355,6 +355,9 @@ resource_registry:
parameter_merge_strategies:
ServiceNetMap: merge
VipSubnetMap: merge
{% for role in roles %}
{{role.name}}Parameters: merge
{% endfor %}
parameter_defaults:
NeutronMechanismDrivers: ovn
@ -367,6 +370,7 @@ parameter_defaults:
# Parameters generated for {{role.name}} Role
{{role.name}}Services: {{role.ServicesDefault|default([])}}
{{role.name}}NetworkDeploymentActions: []
{{role.name}}Parameters: {}
{% endfor %}
ServiceNetMap: