Skip to content

Commit f548dee

Browse files
stephenrjohnsonstephenrjohnson
committed
Merge branch 'djjudas21-passenger_tuning'
2 parents 8208f9a + ae1d958 commit f548dee

File tree

4 files changed

+97
-66
lines changed

4 files changed

+97
-66
lines changed

‎manifests/master.pp‎

Lines changed: 57 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -56,42 +56,47 @@
5656
# }
5757
#
5858
class puppet::master (
59-
$user_id = undef,
60-
$group_id = undef,
61-
$modulepath = $::puppet::params::modulepath,
62-
$manifest = $::puppet::params::manifest,
63-
$external_nodes = undef,
64-
$node_terminus = undef,
65-
$hiera_config = $::puppet::params::hiera_config,
66-
$environmentpath = $::puppet::params::environmentpath,
67-
$environments = $::puppet::params::environments,
68-
$reports = store,
69-
$storeconfigs = false,
70-
$storeconfigs_dbserver = $::puppet::params::storeconfigs_dbserver,
71-
$storeconfigs_dbport = $::puppet::params::storeconfigs_dbport,
72-
$certname = $::fqdn,
73-
$autosign = false,
74-
$reporturl = undef,
75-
$puppet_ssldir = $::puppet::params::puppet_ssldir,
76-
$puppet_docroot = $::puppet::params::puppet_docroot,
77-
$puppet_vardir = $::puppet::params::puppet_vardir,
78-
$puppet_passenger_port = $::puppet::params::puppet_passenger_port,
79-
$puppet_passenger_tempdir = false,
80-
$puppet_passenger_cfg_addon = '',
81-
$puppet_master_package = $::puppet::params::puppet_master_package,
82-
$puppet_master_service = $::puppet::params::puppet_master_service,
83-
$version = 'present',
84-
$apache_serveradmin = $::puppet::params::apache_serveradmin,
85-
$pluginsync = true,
86-
$parser = $::puppet::params::parser,
87-
$puppetdb_startup_timeout = '60',
88-
$puppetdb_strict_validation = $::puppet::params::puppetdb_strict_validation,
89-
$dns_alt_names = ['puppet'],
90-
$digest_algorithm = $::puppet::params::digest_algorithm,
91-
$generate_ssl_certs = true,
92-
$strict_variables = undef,
93-
$puppetdb_version = 'present',
94-
$always_cache_features = false,
59+
$user_id = undef,
60+
$group_id = undef,
61+
$modulepath = $::puppet::params::modulepath,
62+
$manifest = $::puppet::params::manifest,
63+
$external_nodes = undef,
64+
$node_terminus = undef,
65+
$hiera_config = $::puppet::params::hiera_config,
66+
$environmentpath = $::puppet::params::environmentpath,
67+
$environments = $::puppet::params::environments,
68+
$reports = store,
69+
$storeconfigs = false,
70+
$storeconfigs_dbserver = $::puppet::params::storeconfigs_dbserver,
71+
$storeconfigs_dbport = $::puppet::params::storeconfigs_dbport,
72+
$certname = $::fqdn,
73+
$autosign = false,
74+
$reporturl = undef,
75+
$puppet_ssldir = $::puppet::params::puppet_ssldir,
76+
$puppet_docroot = $::puppet::params::puppet_docroot,
77+
$puppet_vardir = $::puppet::params::puppet_vardir,
78+
$puppet_passenger_port = $::puppet::params::puppet_passenger_port,
79+
$puppet_passenger_tempdir = false,
80+
$puppet_passenger_cfg_addon = '',
81+
$puppet_master_package = $::puppet::params::puppet_master_package,
82+
$puppet_master_service = $::puppet::params::puppet_master_service,
83+
$version = 'present',
84+
$apache_serveradmin = $::puppet::params::apache_serveradmin,
85+
$pluginsync = true,
86+
$parser = $::puppet::params::parser,
87+
$puppetdb_startup_timeout = '60',
88+
$puppetdb_strict_validation = $::puppet::params::puppetdb_strict_validation,
89+
$dns_alt_names = ['puppet'],
90+
$digest_algorithm = $::puppet::params::digest_algorithm,
91+
$generate_ssl_certs = true,
92+
$strict_variables = undef,
93+
$puppetdb_version = 'present',
94+
$always_cache_features = false,
95+
$passenger_max_pool_size = $::processorcount,
96+
$passenger_high_performance = true,
97+
$passenger_max_requests = 10000,
98+
$passenger_stat_throttle_rate = 30,
99+
95100

96101
) inherits puppet::params {
97102

@@ -131,17 +136,22 @@
131136

132137
Anchor['puppet::master::begin'] ->
133138
class {'puppet::passenger':
134-
puppet_passenger_port => $puppet_passenger_port,
135-
puppet_docroot => $puppet_docroot,
136-
apache_serveradmin => $apache_serveradmin,
137-
puppet_conf => $::puppet::params::puppet_conf,
138-
puppet_ssldir => $puppet_ssldir,
139-
certname => $certname,
140-
conf_dir => $::puppet::params::confdir,
141-
dns_alt_names => join($dns_alt_names,','),
142-
generate_ssl_certs => $generate_ssl_certs,
143-
puppet_passenger_tempdir => $puppet_passenger_tempdir,
144-
config_addon => $puppet_passenger_cfg_addon,
139+
puppet_passenger_port => $puppet_passenger_port,
140+
puppet_docroot => $puppet_docroot,
141+
apache_serveradmin => $apache_serveradmin,
142+
puppet_conf => $::puppet::params::puppet_conf,
143+
puppet_ssldir => $puppet_ssldir,
144+
certname => $certname,
145+
conf_dir => $::puppet::params::confdir,
146+
dns_alt_names => join($dns_alt_names,','),
147+
generate_ssl_certs => $generate_ssl_certs,
148+
puppet_passenger_tempdir => $puppet_passenger_tempdir,
149+
config_addon => $puppet_passenger_cfg_addon,
150+
passenger_max_pool_size => $passenger_max_pool_size,
151+
passenger_high_performance => $passenger_high_performance,
152+
passenger_max_requests => $passenger_max_requests,
153+
passenger_stat_throttle_rate => $passenger_stat_throttle_rate,
154+
145155
} ->
146156
Anchor['puppet::master::end']
147157

‎manifests/passenger.pp‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,20 @@
4242
$certname,
4343
$conf_dir,
4444
$dns_alt_names,
45-
$config_addon = ''
45+
$config_addon = '',
46+
$passenger_max_pool_size,
47+
$passenger_high_performance,
48+
$passenger_max_requests,
49+
$passenger_stat_throttle_rate,
4650
){
4751
include apache
4852
include puppet::params
49-
class { 'apache::mod::passenger': passenger_max_pool_size => 12, }
53+
class { 'apache::mod::passenger':
54+
passenger_max_pool_size => $passenger_max_pool_size,
55+
passenger_high_performance => $passenger_high_performance,
56+
passenger_max_requests => $passenger_max_requests,
57+
passenger_stat_throttle_rate => $passenger_stat_throttle_rate,
58+
}
5059
include apache::mod::ssl
5160

5261
if $::osfamily == 'redhat' {

‎spec/classes/puppet_passenger_spec.rb‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@
33
describe 'puppet::passenger', :type => :class do
44
let (:params) do
55
{
6-
:puppet_passenger_port => '8140',
7-
:puppet_docroot => '/etc/puppet/rack/public/',
8-
:apache_serveradmin => 'root',
9-
:puppet_conf => '/etc/puppet/puppet.conf',
10-
:puppet_ssldir => '/var/lib/puppet/ssl',
11-
:certname => 'test.test.com',
12-
:conf_dir => '/etc/puppet',
13-
:dns_alt_names => 'puppet',
6+
:puppet_passenger_port => '8140',
7+
:puppet_docroot => '/etc/puppet/rack/public/',
8+
:apache_serveradmin => 'root',
9+
:puppet_conf => '/etc/puppet/puppet.conf',
10+
:puppet_ssldir => '/var/lib/puppet/ssl',
11+
:certname => 'test.test.com',
12+
:conf_dir => '/etc/puppet',
13+
:dns_alt_names => 'puppet',
14+
:passenger_max_pool_size => '4',
15+
:passenger_high_performance => true,
16+
:passenger_max_requests => '1000',
17+
:passenger_stat_throttle_rate => '30',
1418
}
1519
end
1620
context 'on Debian' do
@@ -102,15 +106,19 @@
102106
end
103107
let (:params) do
104108
{
105-
:puppet_passenger_port => '8140',
106-
:puppet_docroot => '/etc/puppet/rack/public/',
107-
:apache_serveradmin => 'root',
108-
:puppet_conf => '/etc/puppet/puppet.conf',
109-
:puppet_ssldir => '/var/lib/puppet/ssl',
110-
:certname => 'test.test.com',
111-
:conf_dir => '/etc/puppet',
112-
:dns_alt_names => ['puppet'],
113-
:puppet_passenger_tempdir => '/tmp/passenger',
109+
:puppet_passenger_port => '8140',
110+
:puppet_docroot => '/etc/puppet/rack/public/',
111+
:apache_serveradmin => 'root',
112+
:puppet_conf => '/etc/puppet/puppet.conf',
113+
:puppet_ssldir => '/var/lib/puppet/ssl',
114+
:certname => 'test.test.com',
115+
:conf_dir => '/etc/puppet',
116+
:dns_alt_names => ['puppet'],
117+
:puppet_passenger_tempdir => '/tmp/passenger',
118+
:passenger_max_pool_size => '4',
119+
:passenger_high_performance => true,
120+
:passenger_max_requests => '1000',
121+
:passenger_stat_throttle_rate => '30',
114122
}
115123
end
116124
it {

‎tests/passenger.pp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@
66
puppet_conf => '/etc/puppet/puppet.conf',
77
puppet_ssldir => '/var/lib/puppet/ssl',
88
certname => 'master.example.com',
9+
passenger_max_pool_size => '4',
10+
passenger_high_performance => true,
11+
passenger_max_requests => '1000',
12+
passenger_stat_throttle_rate => '30',
913
}

0 commit comments

Comments
 (0)