add ability to adjust unicorn worker

Author: Tim Meusel

manifests/master.pp

@@ -3,44 +3,45 @@
 # This class installs and configures a Puppet master
 #
 # Parameters:
-#  ['user_id']                  - The userid of the puppet user
-#  ['group_id']                 - The groupid of the puppet group
-#  ['modulepath']               - Module path to be served by the puppet master
-#  ['manifest']                 - Manifest path
-#  ['external_nodes']           - ENC script path
-#  ['node_terminus']            - Node terminus setting, is overridden to 'exec' if external_nodes is set
-#  ['hiera_config']             - Hiera config file path
-#  ['environments']             - Which environment method (directory or config)
-#  ['environmentpath']          - Puppet environment base path (use with environments directory)
-#  ['reports']                  - Turn on puppet reports
-#  ['storeconfigs']             - Use storedconfigs
-#  ['storeconfigs_dbserver']    - Puppetdb server
-#  ['storeconfigs_dbport']      - Puppetdb port
-#  ['certname']                 - The certname the puppet master should use
-#  ['autosign']                 - Auto sign agent certificates default false
-#  ['reporturl']                - Url to send reports to, if reporting enabled
-#  ['puppet_ssldir']            - Puppet sll directory
-#  ['puppet_docroot']           - Doc root to be configured in apache vhost
-#  ['puppet_vardir']            - Vardir used by puppet
-#  ['puppet_proxy_port']        - Port to configure the proxy on - default 8140
-#  ['puppet_master_package']    - Puppet master package
-#  ['puppet_master_service']    - Puppet master service
-#  ['version']                  - Version of the puppet master package to install
-#  ['apache_serveradmin']       - Apache server admin
-#  ['pluginsync']               - Enable plugin sync
-#  ['parser']                   - Which parser to use
-#  ['puppetdb_startup_timeout'] - The timeout for puppetdb
-#  ['dns_alt_names']            - Comma separated list of alternative DNS names
-#  ['digest_algorithm']         - The algorithm to use for file digests.
-#  ['webserver']                - install 'nginx' (with unicorn) or 'httpd' (with passenger) - httpd is default
-#  ['listen_address']           - IP for binding the webserver, defaults to *
-#  ['disable_ssl']              - Disables SSL on the webserver. usefull if you use this master behind a loadbalancer. currently only supported by nginx, defaults to undef
-#  ['backup_upstream']          - specify another puppet master as fallback. currently only supported by nginx
-#  ['unicorn_package']          - package name of a unicorn rpm. if provided we install it, otherwise we built it via gem/gcc
-#  ['unicorn_path']             - custom path to the unicorn binary
-#  ['generate_ssl_certs']       - Generate ssl certs (false to disable)
-#  ['disable_master']           - this disables the normal master, the server will only act as a CA, currently only supported by nginx
-#  ['upstream']                 - define additional masters reachable via tcp as an array, currently only supported by nginx
+# ['user_id']                   - The userid of the puppet user
+# ['group_id']                  - The groupid of the puppet group
+# ['modulepath']                - Module path to be served by the puppet master
+# ['manifest']                  - Manifest path
+# ['external_nodes']            - ENC script path
+# ['node_terminus']             - Node terminus setting, is overridden to 'exec' if external_nodes is set
+# ['hiera_config']              - Hiera config file path
+# ['environments']              - Which environment method (directory or config)
+# ['environmentpath']           - Puppet environment base path (use with environments directory)
+# ['reports']                   - Turn on puppet reports
+# ['storeconfigs']              - Use storedconfigs
+# ['storeconfigs_dbserver']     - Puppetdb server
+# ['storeconfigs_dbport']       - Puppetdb port
+# ['certname']                  - The certname the puppet master should use
+# ['autosign']                  - Auto sign agent certificates default false
+# ['reporturl']                 - Url to send reports to, if reporting enabled
+# ['puppet_ssldir']             - Puppet sll directory
+# ['puppet_docroot']            - Doc root to be configured in apache vhost
+# ['puppet_vardir']             - Vardir used by puppet
+# ['puppet_proxy_port']         - Port to configure the proxy on - default 8140
+# ['puppet_master_package']     - Puppet master package
+# ['puppet_master_service']     - Puppet master service
+# ['version']                   - Version of the puppet master package to install
+# ['apache_serveradmin']        - Apache server admin
+# ['pluginsync']                - Enable plugin sync
+# ['parser']                    - Which parser to use
+# ['puppetdb_startup_timeout']  - The timeout for puppetdb
+# ['dns_alt_names']             - Comma separated list of alternative DNS names
+# ['digest_algorithm']          - The algorithm to use for file digests.
+# ['webserver']                 - install 'nginx' (with unicorn) or 'httpd' (with passenger) - httpd is default
+# ['listen_address']            - IP for binding the webserver, defaults to *
+# ['disable_ssl']               - Disables SSL on the webserver. usefull if you use this master behind a loadbalancer. currently only supported by nginx, defaults to undef
+# ['backup_upstream']           - specify another puppet master as fallback. currently only supported by nginx
+# ['unicorn_package']           - package name of a unicorn rpm. if provided we install it, otherwise we built it via gem/gcc
+# ['unicorn_path']              - custom path to the unicorn binary
+# ['generate_ssl_certs']        - Generate ssl certs (false to disable)
+# ['disable_master']            - this disables the normal master, the server will only act as a CA, currently only supported by nginx
+# ['upstream']                  - define additional masters reachable via tcp as an array, currently only supported by nginx
+# ['backend_process_number']     - number of processes to start on the backebd webserver (unicorn/passenger), currently only supported by unicorn
 #
 # Requires:
 #
@@ -103,6 +104,7 @@
   $puppetdb_version           = 'present',
   $disable_master             = $::puppet::params::disable_master,
   $upstream                   = $::puppet::params::upstream,
+  $backend_process_number     = $::puppet::params:backend_process_number,
 ) inherits puppet::params {
 
   anchor { 'puppet::master::begin': }
@@ -142,18 +144,19 @@
     nginx: {
       Anchor['puppet::master::begin'] ->
       class {'puppet::unicorn':
-        certname          => $certname,
-        puppet_conf       => $puppet_conf,
-        puppet_ssldir     => $puppet_ssldir,
-        dns_alt_names     => $dns_alt_names,
-        listen_address    => $listen_address,
-        puppet_proxy_port => $puppet_proxy_port,
-        disable_ssl       => $disable_ssl,
-        backup_upstream   => $backup_upstream,
-        unicorn_package   => $unicorn_package,
-        unicorn_path      => $unicorn_path,
-        disable_master    => $disable_master,
-        upstream          => $upstream,
+        certname                => $certname,
+        puppet_conf             => $puppet_conf,
+        puppet_ssldir           => $puppet_ssldir,
+        dns_alt_names           => $dns_alt_names,
+        listen_address          => $listen_address,
+        puppet_proxy_port       => $puppet_proxy_port,
+        disable_ssl             => $disable_ssl,
+        backup_upstream         => $backup_upstream,
+        unicorn_package         => $unicorn_package,
+        unicorn_path            => $unicorn_path,
+        disable_master          => $disable_master,
+        upstream                => $upstream,
+        backend_process_number  => $backend_process_number,
       } ->
       Anchor['puppet::master::end']
     }

manifests/params.pp

@@ -39,6 +39,7 @@
   $unicorn_path                     = '/usr/local/bin/unicorn'
   $disable_master                   = false
   $upstream                         = []
+  $backend_process_number           = $::processorcount
 
   # Only used when environments == directory
   $environmentpath                  = "${confdir}/environments"

manifests/unicorn.pp

@@ -43,6 +43,7 @@
   $unicorn_path,
   $disable_master,
   $upstream,
+  $backend_process_number,
 ){
   class { '::nginx':
     worker_processes  => $::processorcount,
@@ -70,7 +71,7 @@
   }
   file {'unicorn-conf':
     path    => '/etc/puppet/unicorn.conf',
-    source  => 'puppet:///modules/puppet/unicorn.conf',
+    content => template('puppet:///modules/puppet/unicorn.conf'),
   } ->
   file {'copy-config':
     path    => '/etc/puppet/config.ru',

files/unicorn.conf renamed to templates/unicorn.conf

@@ -1,4 +1,4 @@
-worker_processes 16
+worker_processes <%=  @backend_process_number %>;
 working_directory "/etc/puppet"
 listen '/var/run/puppet/puppetmaster_unicorn.sock', :backlog => 512 
 timeout 180