From 3f9175647745c9e84b4516439ef7d0c67c3335a1 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 14 Jan 2014 13:23:34 -0800
Subject: [PATCH] Stop running manage-projects
We need to run manage-projects by hand for a bit until we can track
down why it's breaking things.
Change-Id: I845b5c3e006b54a8e8b0ac780ff3e00a606634d4
---
modules/openstack_project/manifests/gerrit.pp | 15 ---------------
modules/openstack_project/manifests/review.pp | 4 +++-
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 33e0394c0c..aca82a348f 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -330,21 +330,6 @@ class openstack_project::gerrit (
source => 'puppet:///modules/openstack_project/gerrit/acls',
require => Class['::gerrit']
}
-
- exec { 'manage_projects':
- command => '/usr/local/bin/manage-projects',
- timeout => 900, # 15 minutes
- subscribe => [
- File['/home/gerrit2/projects.yaml'],
- File['/home/gerrit2/acls'],
- ],
- refreshonly => true,
- require => [
- File['/home/gerrit2/projects.yaml'],
- File['/home/gerrit2/acls'],
- Class['jeepyb'],
- ],
- }
}
file { '/home/gerrit2/review_site/bin/set_agreements.sh':
ensure => present,
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 2f500a5aaf..189bff14aa 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -176,7 +176,9 @@ class openstack_project::review (
user => 'gerritbot',
vhost_name => $::fqdn,
}
- include gerrit::remotes
+ class { 'gerrit::remotes':
+ ensure => absent,
+ }
file { '/home/gerrit2/.ssh':
ensure => directory,