opendev/system-config
Code Issues Proposed changes

Removed duplicate packages. Changed manifest in cron job.

Browse Source 
Change-Id: Id88b9cfb4a165feb71cb6e5d8aac1d4867fc9560
This commit is contained in:
Monty Taylor 2011-08-02 14:26:49 -07:00
parent 911aab3238
commit 174dc13921
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/jenkins_slave/manifests/init.pp
View File

@ -16,7 +16,7 @@ class jenkins_slave {
cron { "updatepuppet":
user => root,
minute => "*/15",
command => "cd /root/openstack-ci-puppet && /usr/bin/git pull && /var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=/root/openstack-ci-puppet/modules manifests/this.pp",
command => "cd /root/openstack-ci-puppet && /usr/bin/git pull && /var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=/root/openstack-ci-puppet/modules manifests/site.pp",
require => [ Jenkinsuser[jenkins] ]
}
@ -48,10 +48,6 @@ class jenkins_slave {
],
}
package { "python-software-properties":
ensure => latest
}
package { "openjdk-6-jre":
ensure => latest
}
@ -60,22 +56,6 @@ class jenkins_slave {
ensure => latest
}
package { "puppet":
ensure => latest
}
package { "bzr":
ensure => latest
}
package { "git":
ensure => latest
}
package { "python-setuptools":
ensure => latest
}
package { "python-sphinx":
ensure => latest
}
@ -92,10 +72,6 @@ class jenkins_slave {
ensure => latest
}
package { "byobu":
ensure => latest
}
package { "python-dev":
ensure => latest
}