From 4f1c302d37542eff3bc14f95547b4263f9b2244d Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 12 Nov 2012 09:47:19 -0800 Subject: [PATCH] Add proc ulimit and cgroups to oneiric1. The cgroups memory limits and ulimit process limists were never applied to the oneiric slaves. Since it has been a while apply these controls to oneiric1 for testing before we roll them out to the other oneiric slaves. Change-Id: I57ff167c323d2de020872c996d823ef52500d344 Reviewed-on: https://review.openstack.org/15895 Reviewed-by: James E. Blair Reviewed-by: Paul Belanger Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- manifests/site.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index f972f3199b..cf142681af 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -251,6 +251,16 @@ node /^oneiric.*\.slave\.openstack\.org$/ { swift_store_key => hiera('swift_store_key'), swift_store_container => hiera('swift_store_container'), } + if $::hostname == 'oneiric1.slave.openstack.org' { + include jenkins::cgroups + include ulimit + ulimit::conf { 'limit_jenkins_procs': + limit_domain => 'jenkins', + limit_type => 'hard', + limit_item => 'nproc', + limit_value => '256' + } + } } node /^.*\.jclouds\.openstack\.org$/ {