opendev/system-config
Code Issues Proposed changes

Merge "Remove /usr/local/jenkins from single_use_slave.pp"

Browse Source
This commit is contained in:
Jenkins 2017-04-12 16:07:30 +00:00 committed by Gerrit Code Review
commit 2bfa0fb6c1
3 changed files with 30 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/openstack_project/manifests/single_use_slave.pp
View File

@ -13,7 +13,6 @@ class openstack_project::single_use_slave (
$ssh_key = $openstack_project::jenkins_ssh_key, $ssh_key = $openstack_project::jenkins_ssh_key,
$jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org', $jenkins_gitemail = 'jenkins@openstack.org',
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
) inherits openstack_project { ) inherits openstack_project {
class { 'openstack_project::template': class { 'openstack_project::template':
certname => $certname, certname => $certname,
@ -45,15 +44,6 @@ class openstack_project::single_use_slave (
gitemail => $jenkins_gitemail, gitemail => $jenkins_gitemail,
} }
# NOTE(pabelanger): We need to create this directory here, since slave.pp also
# creates it. Moving forward, this will be moved into DIB.
file { '/usr/local/jenkins':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
}
package { 'tox': package { 'tox':
ensure => 'latest', ensure => 'latest',
provider => openstack_pip, provider => openstack_pip,
@ -67,10 +57,8 @@ class openstack_project::single_use_slave (
require => Class[pip], require => Class[pip],
} }
class { 'openstack_project::slave_common': class { 'openstack_project::slave_common':
sudo => $sudo, sudo => $sudo,
project_config_repo => $project_config_repo,
} }
if (! $thin) { if (! $thin) {

32
modules/openstack_project/manifests/slave.pp
View File

@ -43,10 +43,38 @@ class openstack_project::slave (
limit_value => '256' limit_value => '256'
} }
class { 'openstack_project::slave_common': class { 'project_config':
project_config_repo => $project_config_repo, url => $project_config_repo,
} }
file { '/usr/local/jenkins/common_data':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
recurse => true,
purge => true,
force => true,
require => [File['/usr/local/jenkins'],
$::project_config::config_dir],
source => $::project_config::jenkins_data_dir,
}
file { '/usr/local/jenkins/slave_scripts':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
recurse => true,
purge => true,
force => true,
require => [File['/usr/local/jenkins'],
$::project_config::config_dir],
source => $::project_config::jenkins_scripts_dir,
}
class { 'openstack_project::slave_common': }
if (! $thin) { if (! $thin) {
include openstack_project::thick_slave include openstack_project::thick_slave
} }

31
modules/openstack_project/manifests/slave_common.pp
View File

@ -4,7 +4,6 @@
# openstack_project::single_use_slave # openstack_project::single_use_slave
class openstack_project::slave_common( class openstack_project::slave_common(
$sudo = false, $sudo = false,
$project_config_repo = '',
){ ){
vcsrepo { '/opt/requirements': vcsrepo { '/opt/requirements':
ensure => latest, ensure => latest,
@ -13,36 +12,6 @@ class openstack_project::slave_common(
source => 'https://git.openstack.org/openstack/requirements', source => 'https://git.openstack.org/openstack/requirements',
} }
class { 'project_config':
url => $project_config_repo,
}
file { '/usr/local/jenkins/common_data':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
recurse => true,
purge => true,
force => true,
require => [File['/usr/local/jenkins'],
$::project_config::config_dir],
source => $::project_config::jenkins_data_dir,
}
file { '/usr/local/jenkins/slave_scripts':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
recurse => true,
purge => true,
force => true,
require => [File['/usr/local/jenkins'],
$::project_config::config_dir],
source => $::project_config::jenkins_scripts_dir,
}
file { '/home/jenkins/.pydistutils.cfg': file { '/home/jenkins/.pydistutils.cfg':
ensure => present, ensure => present,
owner => 'jenkins', owner => 'jenkins',