opendev/system-config
Code Issues Proposed changes

Merge "Split off .pydistutils.cfg to static slaves"

Browse Source
This commit is contained in:
Jenkins 2017-04-17 21:16:49 +00:00 committed by Gerrit Code Review
commit d23f41eacb
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,15 @@ class openstack_project::slave (
}
}
file { '/home/jenkins/.pydistutils.cfg':
ensure => present,
owner => 'jenkins',
group => 'jenkins',
mode => '0644',
source => 'puppet:///modules/openstack_project/pydistutils.cfg',
require => Class['jenkins::jenkinsuser'],
}
class { 'openstack_project::slave_common': }
if (! $thin) {

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

@ -5,15 +5,6 @@
class openstack_project::slave_common(
$sudo = false,
){
file { '/home/jenkins/.pydistutils.cfg':
ensure => present,
owner => 'jenkins',
group => 'jenkins',
mode => '0644',
source => 'puppet:///modules/openstack_project/pydistutils.cfg',
require => Class['jenkins::jenkinsuser'],
}
if ($sudo == true) {
file { '/etc/sudoers.d/jenkins-sudo':
ensure => present,