openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Harald Jensås 2018-12-03 19:42:26 +01:00
parent d99e6b5407
commit 9efb5f9d52
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/services/gnocchi-api.yaml
View File

@ -79,6 +79,7 @@ resources:
type: ../../puppet/services/gnocchi-api.yaml
properties:
EndpointMap: {get_param: EndpointMap}
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
RoleName: {get_param: RoleName}

1
docker/services/tripleo-ui.yaml
View File

@ -62,6 +62,7 @@ resources:
type: ../../puppet/services/tripleo-ui.yaml
properties:
EndpointMap: {get_param: EndpointMap}
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
RoleName: {get_param: RoleName}

1
puppet/services/nova-api.yaml
View File

@ -119,6 +119,7 @@ resources:
ApacheServiceBase:
type: ./apache.yaml
properties:
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}

1
puppet/services/nova-metadata.yaml
View File

@ -66,6 +66,7 @@ resources:
ApacheServiceBase:
type: ./apache.yaml
properties:
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}