opendev/system-config
Code Issues Proposed changes

Normalize slave ulimits and cgroups.

Browse Source 
Make the slave ulimits and cgroups settings consistent across all slave
platforms. This means enabling ulimits and cgroups on all oneiric static
slaves.

Change-Id: If02b54d2e4fa04646f55f8a4530cea8cc2f4f275
Reviewed-on: https://review.openstack.org/23107
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2013-02-27 11:06:44 -08:00 committed by Jenkins
parent c778aaa2f7
commit 291cc5b16b
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/site.pp
View File

@ -249,9 +249,7 @@ node 'pypi.slave.openstack.org' {
} }
node /^quantal.*\.slave\.openstack\.org$/ { node /^quantal.*\.slave\.openstack\.org$/ {
include jenkins::cgroups
include openstack_project::puppet_cron include openstack_project::puppet_cron
include ulimit
class { 'openstack_project::slave': class { 'openstack_project::slave':
certname => 'quantal.slave.openstack.org', certname => 'quantal.slave.openstack.org',
sysadmins => hiera('sysadmins'), sysadmins => hiera('sysadmins'),
@ -264,6 +262,8 @@ node /^quantal.*\.slave\.openstack\.org$/ {
swift_store_key => hiera('swift_store_key'), swift_store_key => hiera('swift_store_key'),
swift_store_container => hiera('swift_store_container'), swift_store_container => hiera('swift_store_container'),
} }
include jenkins::cgroups
include ulimit
ulimit::conf { 'limit_jenkins_procs': ulimit::conf { 'limit_jenkins_procs':
limit_domain => 'jenkins', limit_domain => 'jenkins',
limit_type => 'hard', limit_type => 'hard',
@ -273,9 +273,7 @@ node /^quantal.*\.slave\.openstack\.org$/ {
} }
node /^precise.*\.slave\.openstack\.org$/ { node /^precise.*\.slave\.openstack\.org$/ {
include jenkins::cgroups
include openstack_project::puppet_cron include openstack_project::puppet_cron
include ulimit
class { 'openstack_project::slave': class { 'openstack_project::slave':
certname => 'precise.slave.openstack.org', certname => 'precise.slave.openstack.org',
sysadmins => hiera('sysadmins'), sysadmins => hiera('sysadmins'),
@ -288,6 +286,8 @@ node /^precise.*\.slave\.openstack\.org$/ {
swift_store_key => hiera('swift_store_key'), swift_store_key => hiera('swift_store_key'),
swift_store_container => hiera('swift_store_container'), swift_store_container => hiera('swift_store_container'),
} }
include jenkins::cgroups
include ulimit
ulimit::conf { 'limit_jenkins_procs': ulimit::conf { 'limit_jenkins_procs':
limit_domain => 'jenkins', limit_domain => 'jenkins',
limit_type => 'hard', limit_type => 'hard',
@ -310,7 +310,6 @@ node /^oneiric.*\.slave\.openstack\.org$/ {
swift_store_key => hiera('swift_store_key'), swift_store_key => hiera('swift_store_key'),
swift_store_container => hiera('swift_store_container'), swift_store_container => hiera('swift_store_container'),
} }
if $::fqdn == 'oneiric1.slave.openstack.org' {
include jenkins::cgroups include jenkins::cgroups
include ulimit include ulimit
ulimit::conf { 'limit_jenkins_procs': ulimit::conf { 'limit_jenkins_procs':
@ -319,14 +318,11 @@ node /^oneiric.*\.slave\.openstack\.org$/ {
limit_item => 'nproc', limit_item => 'nproc',
limit_value => '256' limit_value => '256'
} }
}
} }
node /^rhel6.*\.slave\.openstack\.org$/ { node /^rhel6.*\.slave\.openstack\.org$/ {
include jenkins::cgroups
include openstack_project::puppet_cron include openstack_project::puppet_cron
include ulimit
class { 'openstack_project::slave': class { 'openstack_project::slave':
certname => 'rhel6.slave.openstack.org', certname => 'rhel6.slave.openstack.org',
sysadmins => hiera('sysadmins'), sysadmins => hiera('sysadmins'),
@ -339,6 +335,8 @@ node /^rhel6.*\.slave\.openstack\.org$/ {
swift_store_key => hiera('swift_store_key'), swift_store_key => hiera('swift_store_key'),
swift_store_container => hiera('swift_store_container'), swift_store_container => hiera('swift_store_container'),
} }
include jenkins::cgroups
include ulimit
ulimit::conf { 'limit_jenkins_procs': ulimit::conf { 'limit_jenkins_procs':
limit_domain => 'jenkins', limit_domain => 'jenkins',
limit_type => 'hard', limit_type => 'hard',