From b4cd2ed1ee0f5eb86d0cba75ed40d4679210e616 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Mon, 28 Nov 2016 13:07:12 +0200 Subject: Use network-based fqdn entry from hiera instead of the custom fact This changes how we get the network-based FQDNs for the specific services, from using the custom fact, to the new hiera entries. Change-Id: Iae668a5d89fb7bee091db4a761aa6c91d369b276 --- puppet/services/ceilometer-api.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet/services/ceilometer-api.yaml') diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml index 2f34f248..2e2d3f2d 100644 --- a/puppet/services/ceilometer-api.yaml +++ b/puppet/services/ceilometer-api.yaml @@ -75,7 +75,7 @@ outputs: ceilometer::api::host: str_replace: template: - '%{::fqdn_$NETWORK}' + "%{hiera('fqdn_$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, CeilometerApiNetwork]} ceilometer::wsgi::apache::bind_host: {get_param: [ServiceNetMap, CeilometerApiNetwork]} @@ -83,7 +83,7 @@ outputs: ceilometer::wsgi::apache::servername: str_replace: template: - '%{::fqdn_$NETWORK}' + "%{hiera('fqdn_$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, CeilometerApiNetwork]} service_config_settings: -- cgit 1.2.3-korg