ApacheServiceBase needs ServiceData

[Harald Jensås]

The puppet apache service uses the cidr map in ServiceData. Some services did not pass the ServiceData to the apache service template. Because of this the property resolves to an empty string which is not correct. The empty string cause problems when yaql in common/services.yaml is merging config_settings.

The issue came up when developing this change: https://review.openstack.org/619646
As this change start to use the new "network_cidrs" which contain a list of ip_netwoks (cidrs) we end up passing '' to the yaql map merge code in common/services.yaml:351. Prior to this issue we would pass the empty string embedded in a list (i.e ['']). This did'nt fail the map merge code, but we did end up passing not so nice apache::mod::remoteip::proxy_ips data.

NOTE: Currently only the Horizon use the remoteip apache module.

[Harald Jensås (harald-jensas)]

Fix proposed in master: https://review.openstack.org/621673

NOTE: We should backport https://review.openstack.org/619392 as well.

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/rocky
Review: https://review.openstack.org/622390

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/queens
Review: https://review.openstack.org/622393

[OpenStack Infra (hudson-openstack)]

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

commit 9efb5f9d528f3cc5187830c4c0fcf08c476d3484
Author: Harald Jensås <email address hidden>
Date: Mon Dec 3 19:42:26 2018 +0100

    Fix - ApacheServiceBase needs ServiceData

    The puppet apache service uses the cidr map in ServiceData.
    Services did not pass the ServiceData to the apache
    service template. Because of this the property resolves to
    an empty string which is not correct. The empty string
    cause problems when yaql in common/services.yaml is merging
    config_settings.

    Closes-Bug: #1806718
    Change-Id: Ia3af9535e3af1dad4ac833983ebe29b6002f0815

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/622390
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=57bcfe818e85643c6edd543b0df84aaacf3a9468
Submitter: Zuul
Branch: stable/rocky

commit 57bcfe818e85643c6edd543b0df84aaacf3a9468
Author: Harald Jensås <email address hidden>
Date: Thu Nov 22 02:31:56 2018 +0100

    Fix ServiceData in docker/services/aodh-api.yaml

    The puppet aodh-api.yaml service uses the puppet
    apache service. The apache server uses the cidr
    map in ServiceData.

    The docker service did not pass the ServiceData
    to the puppet service template. The result is
    that the properties resolved to ''.

    Related-Bug: #1806718
    Change-Id: I736e0fa4191fa130f882b09eb87256c62ac69143
    (cherry picked from commit 66142908cf85a8e2c1cd502103df6296eea8b1d1)

[OpenStack Infra (hudson-openstack)]

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

commit 81144a7a58a86dffc075a0c779504bf9b720590e
Author: Harald Jensås <email address hidden>
Date: Thu Nov 22 02:31:56 2018 +0100

    Fix ServiceData in docker/services/aodh-api.yaml

    The puppet aodh-api.yaml service uses the puppet
    apache service. The apache server uses the cidr
    map in ServiceData.

    The docker service did not pass the ServiceData
    to the puppet service template. The result is
    that the properties resolved to ''.

    Related-Bug: #1806718
    Change-Id: I736e0fa4191fa130f882b09eb87256c62ac69143
    (cherry picked from commit 66142908cf85a8e2c1cd502103df6296eea8b1d1)

[OpenStack Infra (hudson-openstack)]

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