summaryrefslogtreecommitdiffstats
path: root/puppet/services/cinder-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/cinder-api.yaml
parent5854a632c4794b344f6bb695dd256086f6282d55 (diff)
parentb4cd2ed1ee0f5eb86d0cba75ed40d4679210e616 (diff)
Merge "Use network-based fqdn entry from hiera instead of the custom fact"
Diffstat (limited to 'puppet/services/cinder-api.yaml')
-rw-r--r--puppet/services/cinder-api.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index 8d57418e..6cb2b194 100644
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@@ -101,7 +101,7 @@ outputs:
cinder::api::bind_host:
str_replace:
template:
- '%{::fqdn_$NETWORK}'
+ "%{hiera('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
cinder::wsgi::apache::ssl: {get_param: EnableInternalTLS}
@@ -115,7 +115,7 @@ outputs:
cinder::wsgi::apache::servername:
str_replace:
template:
- '%{::fqdn_$NETWORK}'
+ "%{hiera('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
-