opendev/system-config
Code Issues Proposed changes

Put the mirror config into slave_common

Browse Source 
slave.pp is skipped for single-use slaves. Put the base mirror config
into slave_common so that it'll get picked up.

Change-Id: I4bff37ecab78264207e83eb237798ed320dfdab7
This commit is contained in:
Monty Taylor 2014-07-01 10:27:36 -07:00
parent b38f92b8ac
commit 5edaf90e60
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,29 +27,6 @@ class openstack_project::slave (
python3 => $python3, python3 => $python3,
} }
file { '/home/jenkins/.pydistutils.cfg':
ensure => present,
owner => 'jenkins',
group => 'jenkins',
mode => '0644',
source => 'puppet:///modules/openstack_project/pydistutils.cfg',
require => Class['jenkins::slave'],
}
file { '/home/jenkins/.pip':
ensure => directory,
require => Class['jenkins::slave'],
}
file { '/home/jenkins/.pip/pip.conf':
ensure => present,
owner => 'jenkins',
group => 'jenkins',
mode => '0644',
source => 'puppet:///modules/openstack_project/pip.conf',
require => File['/home/jenkins/.pip'],
}
class { 'salt': class { 'salt':
salt_master => 'ci-puppetmaster.openstack.org', salt_master => 'ci-puppetmaster.openstack.org',
} }

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

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