Revert "Revert "Stop running manage-projects""

This reverts commit f063f71651.

While we are back to manually running things to work out more bugs stop
running manage-projects automatically. This simplifies the manual
process.

Conflicts:
	modules/openstack_project/manifests/gerrit.pp

Change-Id: Ibd5e8367f732029496323be737df39d406cafc99
This commit is contained in:
Clark Boylan 2014-03-07 11:02:22 -08:00
parent 7ce51563e4
commit aa84680c2a
2 changed files with 3 additions and 17 deletions

View File

@ -374,22 +374,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,
logoutput => true,
require => [
File['/home/gerrit2/projects.yaml'],
File['/home/gerrit2/acls'],
Class['jeepyb'],
],
}
}
file { '/home/gerrit2/review_site/bin/set_agreements.sh':
ensure => present,

View File

@ -195,7 +195,9 @@ class openstack_project::review (
user => 'gerritbot',
vhost_name => $::fqdn,
}
include gerrit::remotes
class { 'gerrit::remotes':
ensure => absent,
}
file { '/home/gerrit2/.launchpadlib':
ensure => directory,