diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2015-07-15 00:30:12 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2015-10-13 12:22:42 +0200 |
| commit | ef7d2abd4051c891f36e7b0cac175a5835694986 (patch) | |
| tree | 56c60f14287f9ef7cb6fcf6f5b5a302c4cb16ad9 /puppet | |
| parent | 37830dd045467b0fa157c6c3604faf1329af752d (diff) | |
Parameterize RabbitMQ FD limit
Together with [1] this change permits to parameterize the file
descriptor limit for RabbitMQ for both the Systemd startup script
and the Pacemaker resource agent.
1. https://github.com/puppetlabs/puppetlabs-rabbitmq/commit/20325325b977c508b151ef8036107dcfefdf990b
Closes-Bug: 1474586
Change-Id: I62d31e483641ccb5cf489df81146ecb31d0c423f
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller.yaml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 8ea7053e..1674e4d6 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -446,6 +446,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 @@ -882,6 +886,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"]' @@ -1196,6 +1208,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} |