{{role.name}}ExtraConfig not honored when using deprecated keys in roles_data

[James Slagle]

If you have a role in roles_data.yaml that uses the deprecated keys like the default Compute role, then ComputeExtraConfig is not honored.

The NovaComptueConifg resource gets rendered to use:

          compute_extraconfig:
            map_merge:
              - {get_param: NovaComputeExtraConfig}
              - {get_param: NovaComputeExtraConfig}

This is b/c the template is:

          {{role.name.lower()}}_extraconfig:
            map_merge:
{%- if role.deprecated_param_extraconfig is defined %}
              - {get_param: {{role.deprecated_param_extraconfig}}}
{%- endif %}
              - {get_param: {{server_resource_name}}ExtraConfig}

Except server_resource_name defaults to:

{%- set server_resource_name = role.deprecated_server_resource_name|default(role.name) -%}

at line 4

So both those items in the map_merge end up as NovaComputeExtraConfig and ComputeExtraConfig is never consumed even though it is defined as a parameter in the template.

The fix here is to use:

              - {get_param: {{role.name}}ExtraConfig}

in the above map_merge

[James Slagle (james-slagle)]

https://review.openstack.org/555795

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/555795

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/555795
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=fa4b3e2a3c634c8f1a18087e508d585a693aa84b
Submitter: Zuul
Branch: master

commit fa4b3e2a3c634c8f1a18087e508d585a693aa84b
Author: James Slagle <email address hidden>
Date: Fri Mar 23 09:59:47 2018 -0400

    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

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/queens
Review: https://review.openstack.org/556862

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/556862
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=f2e19a5a0a5229d1d12d4ecd3a7bb82faa4e9bf9
Submitter: Zuul
Branch: stable/queens

commit f2e19a5a0a5229d1d12d4ecd3a7bb82faa4e9bf9
Author: James Slagle <email address hidden>
Date: Fri Mar 23 09:59:47 2018 -0400

    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
    (cherry picked from commit fa4b3e2a3c634c8f1a18087e508d585a693aa84b)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 9.0.0.0b2 development milestone.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 8.0.2 release.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/pike
Review: https://review.openstack.org/570191

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/570191
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=d29f833a5977b89a110d19c02fa6bf860709af34
Submitter: Zuul
Branch: stable/pike

commit d29f833a5977b89a110d19c02fa6bf860709af34
Author: James Slagle <email address hidden>
Date: Fri Mar 23 09:59:47 2018 -0400

    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
    (cherry picked from commit fa4b3e2a3c634c8f1a18087e508d585a693aa84b)
    (cherry picked from commit f2e19a5a0a5229d1d12d4ecd3a7bb82faa4e9bf9)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 7.0.14 release.