openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add NetIpMap to hieradata for *ExtraConfig overrides"

Browse Source
This commit is contained in:
Zuul 2017-11-02 08:42:16 +00:00 committed by Gerrit Code Review
commit 677f9e8198
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/role.role.j2.yaml
View File

@ -565,6 +565,7 @@ resources:
- bootstrap_node # provided by allNodesConfig - bootstrap_node # provided by allNodesConfig
- all_nodes # provided by allNodesConfig - all_nodes # provided by allNodesConfig
- vip_data # provided by allNodesConfig - vip_data # provided by allNodesConfig
- net_ip_map
- '"%{::osfamily}"' - '"%{::osfamily}"'
# The following are required for compatibility with the Controller role # The following are required for compatibility with the Controller role
# where some vendor integrations added hieradata via ExtraConfigPre # where some vendor integrations added hieradata via ExtraConfigPre
@ -578,6 +579,7 @@ resources:
service_names: service_names:
service_names: {get_param: ServiceNames} service_names: {get_param: ServiceNames}
sensu::subscriptions: {get_param: MonitoringSubscriptions} sensu::subscriptions: {get_param: MonitoringSubscriptions}
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
service_configs: service_configs:
map_replace: map_replace:
- {get_param: ServiceConfigSettings} - {get_param: ServiceConfigSettings}