Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Introduce role-specific NodeUserData, use for docker
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
cinder-api.yaml
diff --git
a/puppet/services/cinder-api.yaml
b/puppet/services/cinder-api.yaml
index
803d8b8
..
6cb2b19
100644
(file)
--- a/
puppet/services/cinder-api.yaml
+++ b/
puppet/services/cinder-api.yaml
@@
-42,7
+42,7
@@
parameters:
CinderWorkers:
type: string
description: Set the number of workers for cinder::wsgi::apache
CinderWorkers:
type: string
description: Set the number of workers for cinder::wsgi::apache
- default: '
"%{::os_workers}"
'
+ default: '
%{::os_workers}
'
EnableInternalTLS:
type: boolean
default: false
EnableInternalTLS:
type: boolean
default: false
@@
-101,7
+101,7
@@
outputs:
cinder::api::bind_host:
str_replace:
template:
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}
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:
cinder::wsgi::apache::servername:
str_replace:
template:
- '"%{::fqdn_$NETWORK}"'
+ "%{hiera('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
-
params:
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
-