diff options
| author |   Michele Baldessari <michele@acksyn.org> | 2017-05-05 12:37:01 +0200 |
|---|---|---|
| committer | Michele Baldessari <michele@acksyn.org> | 2017-05-06 19:09:08 +0200 |
| commit | dde4f6d1cf6e4c2968c910fb0f1139ef391c3b6d (patch) | |
| tree | ceebb8218dd15b3e199ead56d75b2ce28b580dc4 /puppet | |
| parent | 5fc8d234dd962b641c4daeae241b98c63f3fa84d (diff) | |
Set puppet-redis managed_by_cluster_manager to true
Via https://github.com/arioch/puppet-redis/pull/192 puppet-redis grew
ulimit support also for pacemaker managed redis instances. To be able to
use that we need to set redis::managed_by_cluster_manager to true.
We also allow redis::ulimit to be configurable and we set a default of
10420 which was the default value before the above change.
Change-Id: I06129870665d7d3bfa09057fd9f0a33a99f98397
Depends-On: I4ffccfe3e3ba862d445476c14c8f2cb267fa108d
Closes-Bug: #1688464
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/database/redis-base.yaml | 5 | ||||
| -rw-r--r-- | puppet/services/pacemaker/database/redis.yaml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/puppet/services/database/redis-base.yaml b/puppet/services/database/redis-base.yaml index af89ffb1..6d77a84b 100644 --- a/puppet/services/database/redis-base.yaml +++ b/puppet/services/database/redis-base.yaml @@ -8,6 +8,10 @@ parameters: 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 @@ -43,3 +47,4 @@ outputs: redis::sentinel::redis_host: "%{hiera('bootstrap_nodeid_ip')}" redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh' redis::sentinel::sentinel_bind: {get_param: [ServiceNetMap, RedisNetwork]} + redis::ulimit: {get_param: RedisFDLimit} diff --git a/puppet/services/pacemaker/database/redis.yaml b/puppet/services/pacemaker/database/redis.yaml index e702d28b..8229fc2e 100644 --- a/puppet/services/pacemaker/database/redis.yaml +++ b/puppet/services/pacemaker/database/redis.yaml @@ -37,5 +37,6 @@ outputs: - get_attr: [RedisBase, role_data, config_settings] - redis::service_manage: false redis::notify_service: false + redis::managed_by_cluster_manager: true step_config: | include ::tripleo::profile::pacemaker::database::redis |