summaryrefslogtreecommitdiffstats
path: root/puppet/services/gnocchi-api.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-02 09:40:36 +0000
committerGerrit Code Review <review@openstack.org>2016-12-02 09:40:36 +0000
commit5aa0c861a49d2f1c2b8252e3b8295c44de972231 (patch)
treee8534d6859ae22e9807deee9a661266702d96f09 /puppet/services/gnocchi-api.yaml
parent5854a632c4794b344f6bb695dd256086f6282d55 (diff)
parentb4cd2ed1ee0f5eb86d0cba75ed40d4679210e616 (diff)
Merge "Use network-based fqdn entry from hiera instead of the custom fact"
Diffstat (limited to 'puppet/services/gnocchi-api.yaml')
-rw-r--r--puppet/services/gnocchi-api.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml
index d5f8e62d..b3d39e0f 100644
--- a/puppet/services/gnocchi-api.yaml
+++ b/puppet/services/gnocchi-api.yaml
@@ -91,7 +91,7 @@ outputs:
gnocchi::wsgi::apache::servername:
str_replace:
template:
- '%{::fqdn_$NETWORK}'
+ "%{hiera('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, GnocchiApiNetwork]}
tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend}
@@ -105,7 +105,7 @@ outputs:
gnocchi::api::host:
str_replace:
template:
- '%{::fqdn_$NETWORK}'
+ "%{hiera('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, GnocchiApiNetwork]}