From f481337a0bfbabada52a0e25e0cacde2d6e3603f Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 14 Apr 2014 17:59:48 +0000 Subject: [PATCH] Revert "Revert "Revert "Stop running manage-projects""" Now that puppet is being driven centrally with sequencing, we can let it run manage-projects too. We still don't want the manage-projects cronjob run - so we'll want to add something else to do upstream tracking. This reverts commit aa84680c2a87e2b17b2884ed63a9ba74530cc843 Change-Id: I2fcc4165d49858df9ff2dc19613f992fb6b736f0 --- modules/openstack_project/manifests/gerrit.pp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp index c0cde20ace..2ea81f6670 100644 --- a/modules/openstack_project/manifests/gerrit.pp +++ b/modules/openstack_project/manifests/gerrit.pp @@ -374,6 +374,22 @@ 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,