openstack
/
fuel-library
Code Issues Proposed changes

Configure Cobbler's Apache with reqtimeout module 

This change adds the reqtimeout module to the Cobbler's Apache
configuration to reduce the risk of timeouts on large clusters.

Change-Id: Ife2c421145a616c5033efca62870eff64c274217
Related-Bug: #1608700
Signed-off-by: Maksim Malchuk <mmalchuk@mirantis.com>
This commit is contained in:
Maksim Malchuk 2016-09-07 16:25:34 +03:00
parent 7d658f8ace
commit f95bb52c8f
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
deployment/puppet/cobbler/manifests/server.pp
View File

@ -33,6 +33,7 @@ class cobbler::server (
$dhcp_gateway = unset,
$dhcp_lease_max = '1800',
$lease_time = '120m',
$reqtimeout = '120',
) {
include ::cobbler::packages
@ -141,8 +142,9 @@ class cobbler::server (
#TODO(mattymo): refactor this into cobbler module and use OS-dependent
#directories
file { ['/etc/httpd',
'/etc/httpd/conf/',
'/etc/httpd/conf.d/',
'/etc/httpd/conf',
'/etc/httpd/conf.d',
'/etc/httpd/conf.modules.d',
'/var/lib/fuel',
'/var/lib/fuel/keys',
'/var/lib/fuel/keys/master',
@ -156,8 +158,8 @@ class cobbler::server (
group => 'root',
mode => '0644',
require => [File['/etc/httpd'],
File['/etc/httpd/conf/'],
File['/etc/httpd/conf.d/']],
File['/etc/httpd/conf'],
File['/etc/httpd/conf.d']],
notify => Service[$cobbler_web_service],
}
openssl::certificate::x509 { 'cobbler':
@ -184,8 +186,8 @@ class cobbler::server (
group => 'root',
mode => '0644',
require => [File['/etc/httpd'],
File['/etc/httpd/conf/'],
File['/etc/httpd/conf.d/']],
File['/etc/httpd/conf'],
File['/etc/httpd/conf.d']],
notify => Service[$cobbler_web_service],
}
file { '/etc/httpd/conf/httpd.conf':
@ -194,8 +196,8 @@ class cobbler::server (
group => 'root',
mode => '0644',
require => [File['/etc/httpd'],
File['/etc/httpd/conf/'],
File['/etc/httpd/conf.d/']],
File['/etc/httpd/conf'],
File['/etc/httpd/conf.d']],
notify => Service[$cobbler_web_service],
}
@ -204,7 +206,7 @@ class cobbler::server (
owner => 'root',
group => 'root',
mode => '0644',
require => File['/etc/httpd/conf.d/'],
require => File['/etc/httpd/conf.d'],
notify => Service[$cobbler_web_service],
}
@ -217,6 +219,16 @@ class cobbler::server (
match => "^DEBUG.*$",
}
# tempate uses $reqtimeout
file { '/etc/httpd/conf.modules.d/20-reqtimeout.conf':
content => template('cobbler/cobbler-reqtimeout.conf.erb'),
owner => 'root',
group => 'root',
mode => '0644',
require => File['/etc/httpd/conf.modules.d'],
notify => Service[$cobbler_web_service],
}
service { $cobbler_web_service:
ensure => running,
enable => true,

3
deployment/puppet/cobbler/templates/cobbler-reqtimeout.conf.erb Normal file
View File

@ -0,0 +1,3 @@
<IfModule reqtimeout_module>
RequestReadTimeout header=<%= @reqtimeout %> body=<%= @reqtimeout %>
</IfModule>