From 0d8b89c2528824a1d39c404ea44103d74dafa0a3 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <james.blair@rackspace.com>
Date: Wed, 17 Aug 2011 21:09:23 +0000
Subject: [PATCH] Cleanup.
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
---
manifests/site.pp | 3 +--
modules/gerrit/manifests/init.pp | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/manifests/site.pp b/manifests/site.pp
index 9ee65ab3e2..3c324082ce 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -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',
}
}
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 148b7e11c7..8894073d75 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -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':