openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Honor {{role.name}}ExtraConfig with deprecated params"

This commit is contained in:
Zuul 2018-03-27 03:32:05 +00:00 committed by Gerrit Code Review
parent ee99f3977b fa4b3e2a3c
commit 081f221a68
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -543,7 +543,7 @@ resources:
{%- if role.deprecated_param_extraconfig is defined %}
- {get_param: {{role.deprecated_param_extraconfig}}}
{%- endif %}
- {get_param: {{server_resource_name}}ExtraConfig}
- {get_param: {{role.name}}ExtraConfig}
extraconfig: {get_param: ExtraConfig}
{{role.name.lower()}}:
tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: LoggingSources}

6
releasenotes/notes/use-role-name-ExtraConfig-with-deprecations-2688f34fbc6de74a.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
``{{role.name}}ExtraConfig`` will now be honored even when using deprecated
params in roles_data.yaml. Previously, its value was ignored and never used
even though it is defined as a valid parameter in the rendered template.