From 5d4a4fdebaf5cee05b62d1ac84297cee0d991082 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 25 Jan 2013 22:07:08 +0000 Subject: [PATCH] Support Ubuntu 12.10 for Jenkins slaves. * manifests/site.pp: Added a quantal node group identical to the precise one except with the match regex and cert name changed. Change-Id: Ib2e5a9bb3cfdd62622d1f99e825f9ff3ae15b2af Reviewed-on: https://review.openstack.org/20532 Reviewed-by: James E. Blair Reviewed-by: Clark Boylan Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- manifests/site.pp | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/manifests/site.pp b/manifests/site.pp index ee7ce10145..f3c3f0e20d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -230,7 +230,30 @@ node 'pypi.slave.openstack.org' { } } -# Rollout cgroups to precise slaves. +node /^quantal.*\.slave\.openstack\.org$/ { + include jenkins::cgroups + include openstack_project::puppet_cron + include ulimit + class { 'openstack_project::slave': + certname => 'quantal.slave.openstack.org', + sysadmins => hiera('sysadmins'), + } + class { 'openstack_project::glancetest': + s3_store_access_key => hiera('s3_store_access_key'), + s3_store_secret_key => hiera('s3_store_secret_key'), + s3_store_bucket => hiera('s3_store_bucket'), + swift_store_user => hiera('swift_store_user'), + swift_store_key => hiera('swift_store_key'), + swift_store_container => hiera('swift_store_container'), + } + ulimit::conf { 'limit_jenkins_procs': + limit_domain => 'jenkins', + limit_type => 'hard', + limit_item => 'nproc', + limit_value => '256' + } +} + node /^precise.*\.slave\.openstack\.org$/ { include jenkins::cgroups include openstack_project::puppet_cron