diff --git a/modules/jenkins_slave/manifests/jenkinsuser.pp b/modules/jenkins_slave/manifests/jenkinsuser.pp index f781f31bbd..2fc92280b1 100644 --- a/modules/jenkins_slave/manifests/jenkinsuser.pp +++ b/modules/jenkins_slave/manifests/jenkinsuser.pp @@ -216,45 +216,13 @@ define jenkinsuser($ensure = present, $ssh_key) { file { '/usr/local/jenkins/slave_scripts': owner => 'root', group => 'root', - mode => 755, + mode => 644, ensure => 'directory', + recurse => true, 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 => [ - "puppet:///modules/jenkins_slave/${name}", + "puppet:///modules/jenkins_slave/slave_scripts", ], } - }