summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-17 21:52:33 +0000
committerGerrit Code Review <review@openstack.org>2016-03-17 21:52:33 +0000
commitbf0f8d0f41262bf460aff10a7dafc905ea5fcab1 (patch)
tree52da42a6a7a461cb730ae9979a29ab7492545b36
parent9b99d093929e2bfae73c61886991b1e468354e0f (diff)
parent62752880c42a4dbb5b5338bb3ff33b9c874861ec (diff)
Merge "Remove forced rabbitmq::file_limit conversion to string"
-rw-r--r--puppet/controller.yaml9
1 files changed, 1 insertions, 8 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index a873ce8a..6a9e8720 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1195,16 +1195,9 @@ resources:
rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
rabbit_client_port: {get_param: RabbitClientPort}
rabbit_ipv6: {get_param: RabbitIPv6}
+ rabbit_fd_limit: {get_param: RabbitFDLimit}
mongodb_no_journal: {get_param: MongoDbNoJournal}
mongodb_ipv6: {get_param: MongoDbIPv6}
- # 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: {get_param: NtpServer}
timezone: {get_param: TimeZone}
control_virtual_interface: {get_param: ControlVirtualInterface}