Merge lp:~james-page/charms/precise/rabbitmq-server/ulimit-increase into lp:charms/rabbitmq-server

[James Page]

Increase default ulimit to something more scalable.

This can be pushed to the trusty charm branch as well.

[lp:~james-page/charms/precise/rabbitmq-server/ulimit-increase]

55. By James Page on 2014-05-21

Tune heartbeat

56. By James Page on 2014-05-23

Backout heartbeat changes

[Charles Butler (lazypower)]

+1 LGTM

Thanks for the submission!

review: Approve

[Charles Butler (lazypower)]

Pushed to both precise/trusty.

[Jorge Niedbalski (niedbalski)]

Hello James,

Please review https://code.launchpad.net/~niedbalski/charms/precise/rabbitmq-server/ulimit-increase/+merge/222868

I think using /etc/security/limits.d/ would be a better option for this change.

Let me know your impression.

review: Needs Information

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2014-05-02 14:18:00 +0000
+++ hooks/rabbitmq_server_relations.py	2014-05-23 08:13:18 +0000
@@ -515,7 +515,8 @@
     # Add archive source if provided
     add_source(config('source'), config('key'))
     apt_update(fatal=True)
-
+    # Copy in defaults file for updated ulimits
+    shutil.copyfile('templates/rabbitmq-server', '/etc/default/rabbitmq-server')
     # Install packages to ensure any changes to source
     # result in an upgrade if applicable.
     apt_install(rabbit.PACKAGES, fatal=True)
 
=== added file 'templates/rabbitmq-server'
--- templates/rabbitmq-server	1970-01-01 00:00:00 +0000
+++ templates/rabbitmq-server	2014-05-23 08:13:18 +0000
@@ -0,0 +1,3 @@
+# Generated by juju
+# bump ulimit so rabbit can support lots of connections
+ulimit -n 65536