From 9efb5f9d528f3cc5187830c4c0fcf08c476d3484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Mon, 3 Dec 2018 19:42:26 +0100 Subject: [PATCH] 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 --- docker/services/gnocchi-api.yaml | 1 + docker/services/tripleo-ui.yaml | 1 + puppet/services/nova-api.yaml | 1 + puppet/services/nova-metadata.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml index 3cb4e45b3f..e3bfd34f51 100644 --- a/docker/services/gnocchi-api.yaml +++ b/docker/services/gnocchi-api.yaml @@ -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} diff --git a/docker/services/tripleo-ui.yaml b/docker/services/tripleo-ui.yaml index 1a90e34abd..972fe9fcad 100644 --- a/docker/services/tripleo-ui.yaml +++ b/docker/services/tripleo-ui.yaml @@ -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} diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml index 08fec7052a..03bbc1d3f9 100644 --- a/puppet/services/nova-api.yaml +++ b/puppet/services/nova-api.yaml @@ -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} diff --git a/puppet/services/nova-metadata.yaml b/puppet/services/nova-metadata.yaml index 4349056680..997a6511fd 100644 --- a/puppet/services/nova-metadata.yaml +++ b/puppet/services/nova-metadata.yaml @@ -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}