diff --git a/manifests/site.pp b/manifests/site.pp index 489dbd4782..659e1972e7 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -322,6 +322,32 @@ node /^oneiric.*\.slave\.openstack\.org$/ { } } + +node /^rhel6.*\.slave\.openstack\.org$/ { + include jenkins::cgroups + include openstack_project::puppet_cron + include ulimit + class { 'openstack_project::slave': + certname => 'rhel6.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 /^.*\.jclouds\.openstack\.org$/ { class { 'openstack_project::bare_slave': certname => 'jclouds.openstack.org',