opendev/system-config
Code Issues Proposed changes

Use recurse to send in the entire directory.

Browse Source 
The file type has a recurse which works much better than giving a
list of files.

Change-Id: Ic84583e231ac7b3fdcb659e9cf78e085e8a31ecc
This commit is contained in:
Monty Taylor 2012-04-02 23:36:04 -06:00
parent f3ba7950d8
commit 24220782cb
1 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
modules/jenkins_slave/manifests/jenkinsuser.pp
View File

@ -216,45 +216,13 @@ define jenkinsuser($ensure = present, $ssh_key) {
file { '/usr/local/jenkins/slave_scripts': file { '/usr/local/jenkins/slave_scripts':
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => 755, mode => 644,
ensure => 'directory', ensure => 'directory',
recurse => true,
require => File['/usr/local/jenkins'], require => File['/usr/local/jenkins'],
}
$slave_scripts = [
'slave_scripts/baremetal-archive-logs.sh',
'slave_scripts/baremetal-deploy.sh',
'slave_scripts/baremetal-os-install.sh',
'slave_scripts/build-bundle.sh',
'slave_scripts/build-venv.sh',
'slave_scripts/copy-bundle.sh',
'slave_scripts/copy-venv.sh',
'slave_scripts/create-ppa-package.sh',
'slave_scripts/create-tarball.sh',
'slave_scripts/gerrit-git-prep.sh',
'slave_scripts/lvm-kexec-reset.sh',
'slave_scripts/ping.py',
'slave_scripts/propose_translations.sh',
'slave_scripts/run-cover.sh',
'slave_scripts/run-docs.sh',
'slave_scripts/run-tox.sh',
'slave_scripts/update-pip-cache.sh',
'slave_scripts/wait_for_nova.sh',
'slave_scripts/wait_for_puppet.sh',
]
file { $slave_scripts:
name => "/usr/local/jenkins/slave_scripts/${name}",
owner => 'root',
group => 'root',
mode => 750,
ensure => 'present',
require => File['/usr/local/jenkins/slave_scripts'],
source => [ source => [
"puppet:///modules/jenkins_slave/${name}", "puppet:///modules/jenkins_slave/slave_scripts",
], ],
} }
} }