diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-07 21:04:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-07 21:04:14 +0000 |
| commit | dd6c1064eae369f672478a01f9fe2f835485fdc5 (patch) | |
| tree | 482e0c5d4a3e0c33583393556d0c01e33f1ce6d5 | |
| parent | edc29bc06838c9397b39067de8aaa4d8002469fc (diff) | |
| parent | dde4f6d1cf6e4c2968c910fb0f1139ef391c3b6d (diff) | |
Merge "Set puppet-redis managed_by_cluster_manager to true"
| -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 |