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
TLS everywhere: configure mongodb's TLS settings
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
database
/
redis-base.yaml
diff --git
a/puppet/services/database/redis-base.yaml
b/puppet/services/database/redis-base.yaml
index
4ed3c00
..
fff817e
100644
(file)
--- a/
puppet/services/database/redis-base.yaml
+++ b/
puppet/services/database/redis-base.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-04-08
+heat_template_version:
ocata
description: >
OpenStack Redis service configured with Puppet
description: >
OpenStack Redis service configured with Puppet
@@
-8,6
+8,10
@@
parameters:
description: The password for Redis
type: string
hidden: true
description: The password for Redis
type: string
hidden: true
+ RedisFDLimit:
+ description: Configure Redis FD limit
+ type: string
+ default: 10240
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@
-17,6
+21,14
@@
parameters:
DefaultPasswords:
default: {}
type: json
DefaultPasswords:
default: {}
type: json
+ RoleName:
+ default: ''
+ description: Role name on which the service is applied
+ type: string
+ RoleParameters:
+ default: {}
+ description: Parameters specific to the role
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-39,6
+51,8
@@
outputs:
# internal_api_subnet - > IP/CIDR
redis::bind: {get_param: [ServiceNetMap, RedisNetwork]}
redis::port: 6379
# internal_api_subnet - > IP/CIDR
redis::bind: {get_param: [ServiceNetMap, RedisNetwork]}
redis::port: 6379
- redis::sentinel::master_name:
'"%{hiera(\"bootstrap_nodeid\")}"'
- redis::sentinel::redis_host:
'"%{hiera(\"bootstrap_nodeid_ip\")}"'
+ redis::sentinel::master_name:
"%{hiera('bootstrap_nodeid')}"
+ redis::sentinel::redis_host:
"%{hiera('bootstrap_nodeid_ip')}"
redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
+ redis::sentinel::sentinel_bind: {get_param: [ServiceNetMap, RedisNetwork]}
+ redis::ulimit: {get_param: RedisFDLimit}