Merge "Tweak mpm_worker settings"

modules/openstack_project/files/files/mpm_worker.conf

@@ -0,0 +1,23 @@
+# Managed by puppet
+# worker MPM
+# StartServers: initial number of server processes to start
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadLimit: ThreadsPerChild can be changed to this maximum value during a
+# graceful restart. ThreadLimit can only be changed by stopping
+# and starting Apache.
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestWorkers: maximum number of threads
+# MaxConnectionsPerChild: maximum number of requests a server process serves
+
+<IfModule mpm_worker_module>
+    StartServers             2
+    MinSpareThreads         25
+    MaxSpareThreads         75
+    ThreadLimit             64
+    ThreadsPerChild         25
+    MaxRequestWorkers      400
+    MaxConnectionsPerChild   0
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

modules/openstack_project/manifests/files.pp

@@ -91,6 +91,12 @@ class openstack_project::files (
   httpd::mod { 'mpm_event': ensure => 'absent' }
   httpd::mod { 'mpm_worker': ensure => 'present' }
 
+  file { '/etc/apache2/mods-available/mpm_worker.conf':
+    ensure => file,
+    source => 'puppet:///modules/openstack_project/files/mpm_worker.conf',
+    notify => Service['httpd'],
+  }
+
   ###########################################################
   # docs.openstack.org