summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-13 15:59:42 +0000
committerGerrit Code Review <review@openstack.org>2015-10-13 15:59:42 +0000
commita3763aae276ad12e6762e98f8e44d24492c70ed9 (patch)
tree8d52e471a5523ce49e561189bfa2b6ffeeb56fb7 /puppet
parenta0497f19c34c79bd725219b0243bcca54a24f971 (diff)
parentef7d2abd4051c891f36e7b0cac175a5835694986 (diff)
Merge "Parameterize RabbitMQ FD limit"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller.yaml13
1 files changed, 13 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index aacd1407..92524860 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -455,6 +455,10 @@ parameters:
default: 5672
description: Set rabbit subscriber port, change this if using SSL
type: number
+ RabbitFDLimit:
+ default: 16384
+ description: Configures RabbitMQ FD limit
+ type: string
RedisVirtualIP:
type: string
default: '' # Has to be here because of the ignored empty value bug
@@ -894,6 +898,14 @@ resources:
rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
rabbit_client_port: {get_param: RabbitClientPort}
mongodb_no_journal: {get_param: MongoDbNoJournal}
+ # We need to force this into quotes or hiera will return integer causing
+ # the puppet module validation regexp to fail.
+ # Remove when: https://github.com/puppetlabs/puppetlabs-rabbitmq/pull/401
+ rabbit_fd_limit:
+ str_replace:
+ template: "'LIMIT'"
+ params:
+ LIMIT: {get_param: RabbitFDLimit}
ntp_servers:
str_replace:
template: '["server"]'
@@ -1208,6 +1220,7 @@ resources:
# Rabbit
rabbitmq::node_ip_address: {get_input: rabbitmq_network}
rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
+ rabbitmq::file_limit: {get_input: rabbit_fd_limit}
# Redis
redis::bind: {get_input: redis_network}
redis_vip: {get_input: redis_vip}