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
Merge "Introduce role-specific NodeUserData, use for docker"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
barbican-api.yaml
diff --git
a/puppet/services/barbican-api.yaml
b/puppet/services/barbican-api.yaml
index
b266674
..
24687d0
100644
(file)
--- a/
puppet/services/barbican-api.yaml
+++ b/
puppet/services/barbican-api.yaml
@@
-24,7
+24,7
@@
parameters:
hidden: true
BarbicanWorkers:
description: Set the number of workers for barbican::wsgi::apache
hidden: true
BarbicanWorkers:
description: Set the number of workers for barbican::wsgi::apache
- default: '
"%{::processorcount}"
'
+ default: '
%{::processorcount}
'
type: string
Debug:
default: ''
type: string
Debug:
default: ''
@@
-93,7
+93,7
@@
outputs:
barbican::wsgi::apache::servername:
str_replace:
template:
barbican::wsgi::apache::servername:
str_replace:
template:
- '"%{::fqdn_$NETWORK}"'
+ "%{hiera('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, BarbicanApiNetwork]}
barbican::db::database_connection:
params:
$NETWORK: {get_param: [ServiceNetMap, BarbicanApiNetwork]}
barbican::db::database_connection: