From ee980266f8e1533f08fa7bc606611d00439f29fd Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Thu, 22 Mar 2012 18:04:24 +0000 Subject: [PATCH] Make lodgeit module use our lodgeit git repo Our lodgeit repo has antispam and will have other features soon Change-Id: I12b1f8c1bfb5a2442370a55f8527196364c91ec8 --- manifests/init.pp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 5a2dd59..e77eed2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -33,10 +33,11 @@ class lodgeit { hasrestart => true } -# if we already have the mercurial repo the pull updates +# if we already have the git repo the pull updates exec { "update_lodgeit": - command => "hg pull /tmp/lodgeit-main", + command => "git pull --ff-only", + cwd => "/tmp/lodgeit-main", path => "/bin:/usr/bin", onlyif => "test -d /tmp/lodgeit-main" } @@ -44,7 +45,7 @@ class lodgeit { # otherwise get a new clone of it exec { "get_lodgeit": - command => "hg clone https://bitbucket.org/dcolish/lodgeit-main /tmp/lodgeit-main", + command => "git clone git://github.com/openstack-ci/lodgeit.git /tmp/lodgeit-main", path => "/bin:/usr/bin", onlyif => "test ! -d /tmp/lodgeit-main" }