opendev/system-config
Code Issues Proposed changes

Cleanup.

Browse Source 
Remove include cowbuilder; not needed since it's a module.
Change cron strings to single quotes so that puppet doesn't try to
interpolate escaped chars.

Change-Id: I4f6b7b84fc7b0b67a49edabc5138bcbe345d1784
Reviewed-on: https://review.openstack.org/267
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2011-08-17 21:09:23 +00:00 committed by Jenkins
parent cfa2c921cb
commit 0d8b89c252
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

@ -1,7 +1,6 @@
import "openstack_admins_users" #TODO: refactor
import "openstack_ci_admins_users" #TODO: refactor
import "doc_server" # TODO: refactor out of module
import "cowbuilder"
#
# Abstract classes:
@ -33,7 +32,7 @@ class openstack_base {
cron { "updatepuppet":
user => root,
minute => "*/15",
command => "sleep $((RANDOM\%600)) && cd /root/openstack-ci-puppet && /usr/bin/git pull -q && /var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=/root/openstack-ci-puppet/modules manifests/site.pp",
command => 'sleep $((RANDOM\%600)) && cd /root/openstack-ci-puppet && /usr/bin/git pull -q && /var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=/root/openstack-ci-puppet/modules manifests/site.pp',
}
}

6
modules/gerrit/manifests/init.pp
View File

@ -39,19 +39,19 @@ $commentlinks = [ { name => 'changeid',
cron { "gerritupdateci":
user => gerrit2,
minute => "*/15",
command => "sleep $((RANDOM\%60)) && cd /home/gerrit2/openstack-ci && /usr/bin/git pull -q origin master"
command => 'sleep $((RANDOM\%60)) && cd /home/gerrit2/openstack-ci && /usr/bin/git pull -q origin master'
}
cron { "gerritsyncusers":
user => gerrit2,
minute => "*/15",
command => "sleep $((RANDOM\%60+60)) && cd /home/gerrit2/openstack-ci && python gerrit/update_gerrit_users.py"
command => 'sleep $((RANDOM\%60+60)) && cd /home/gerrit2/openstack-ci && python gerrit/update_gerrit_users.py'
}
cron { "gerritclosepull":
user => gerrit2,
minute => "*/5",
command => "sleep $((RANDOM\%60+90)) && cd /home/gerrit2/openstack-ci && python gerrit/close_pull_requests.py"
command => 'sleep $((RANDOM\%60+90)) && cd /home/gerrit2/openstack-ci && python gerrit/close_pull_requests.py'
}
file { '/home/gerrit2/github.config':