openstack/tripleo-heat-templates
Code Issues Proposed changes

Remove service_names hieradata file

Browse Source 
The service_names isn't useful anymore:

- hiera('service_names') has been replaced by hiera('enabled_services')
- sensu::subscriptions moved under the {{role.name.lower()}}_extraconfig
  hieradata file.

This is part of the effort which aims to reduce the number of hieradata
files.

Depends-On: I457f2c81a2cf6cc2f42dc4585b41b0d91dacc059
Change-Id: I22081888541e059cd9f258d15990f58df78c38d2
Closes-Bug: #1835551
This commit is contained in:
Emilien Macchi 2019-07-05 13:38:56 -04:00
parent 9e90d875c7
commit 55ad225844
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
overcloud.j2.yaml
View File

@ -978,7 +978,6 @@ resources:
- config_step - config_step
- {{role.name.lower()}}_extraconfig - {{role.name.lower()}}_extraconfig
- extraconfig - extraconfig
- service_names
- service_configs - service_configs
- cloud_domain - cloud_domain
- bootstrap_node # provided by tripleo-hieradata - bootstrap_node # provided by tripleo-hieradata

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

@ -649,12 +649,10 @@ resources:
value: value:
type: json type: json
datafiles: datafiles:
service_names:
service_names: {get_param: ServiceNames}
sensu::subscriptions: {get_param: MonitoringSubscriptions}
service_configs: {get_param: ServiceConfigSettings} service_configs: {get_param: ServiceConfigSettings}
{{role.name.lower()}}_extraconfig: {{role.name.lower()}}_extraconfig:
map_merge: map_merge:
- sensu::subscriptions: {get_param: MonitoringSubscriptions}
{%- if role.deprecated_param_extraconfig is defined %} {%- if role.deprecated_param_extraconfig is defined %}
- {get_param: {{role.deprecated_param_extraconfig}}} - {get_param: {{role.deprecated_param_extraconfig}}}
{%- endif %} {%- endif %}