openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Re-enable "service_names" hieradata" into stable/train

This commit is contained in:
Zuul 2019-12-06 07:16:33 +00:00 committed by Gerrit Code Review
parent 30316cb8ad d8b0607271
commit 9f3dc8a219
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/deploy-steps.j2
View File

@ -534,6 +534,7 @@ outputs:
- net_ip_map
- cloud_domain
- fqdn
- service_names
- service_configs
- extraconfig
- role_extraconfig

2
overcloud.j2.yaml
View File

@ -575,6 +575,7 @@ resources:
type: json
value:
service_configs: {get_attr: [{{role.name}}ServiceConfigSettings, value]}
service_names: {get_attr: [{{role.name}}ServiceNames, value]}
role_extraconfig:
map_merge:
- tripleo::profile::base::metrics::collectd::sensubility::subscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]}
@ -592,6 +593,7 @@ resources:
- role_extraconfig
- extraconfig
- pci_passthrough_whitelist
- service_names
- service_configs
- cloud_domain
- bootstrap_node # provided by tripleo-hieradata