change to how ulimit is set now

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/rabbitmq/manifests/init.pp b/modules/rabbitmq/manifests/init.pp
index ba3c11f2e735c9ab8559638df0ccc97b3df760f1..33182da0c532135bd8a4ea322ff70ca0092f7936 100644 (file)
--- a/modules/rabbitmq/manifests/init.pp
+++ b/modules/rabbitmq/manifests/init.pp
@@ -44,14 +44,8 @@ class rabbitmq (
                content => "].\n"
        }
 
-       file { '/etc/rabbitmq/rabbitmq.conf.d/':
-               ensure  => directory,
-               require => Package['rabbitmq-server']
-       }
-
-       file { '/etc/rabbitmq/rabbitmq.conf.d/ulimit.conf':
+       file { '/etc/default/rabbitmq-server':
                content => template('rabbitmq/rabbitmq.ulimit.erb'),
-               require => [ Package['rabbitmq-server'], File['/etc/rabbitmq/rabbitmq.conf.d/'] ],
                notify  => Service['rabbitmq-server']
        }
 

diff --git a/modules/rabbitmq/templates/rabbitmq.ulimit.erb b/modules/rabbitmq/templates/rabbitmq.ulimit.erb
index 813f5000f4484f0c4df4fa3e0fd56811157b07b4..d1544b39c0758e8ce104dc97187dd6b9f329b889 100644 (file)
--- a/modules/rabbitmq/templates/rabbitmq.ulimit.erb
+++ b/modules/rabbitmq/templates/rabbitmq.ulimit.erb
@@ -1 +1 @@
-ulimit -n <%= scope.lookupvar('rabbit_num_ofiles') %>
+ulimit -n <%= @rabbit_num_ofiles %>