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

{{role.name}}ExtraConfig was previously ignored if the role used
deprecated params in roles_data.yaml. This was due to the usage of
server_resource_name in the ExtraConfig resource, where
service_resource_name also defaulted to
deprecated_service_resource_name. So, the new {{role.name}}ExtraConfig
was never actually used.

Change-Id: I83e57317e2c56260957be90c66290a41a926835a
Closes-Bug: #1758343
This commit is contained in:
James Slagle 2018-03-23 09:59:47 -04:00 committed by Harald Jensås
parent 0299096401
commit fa4b3e2a3c
2 changed files with 7 additions and 1 deletions

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}

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.