From f063f71651ff6d676944bd10ed3674351817bdb9 Mon Sep 17 00:00:00 2001 From: Anita Kuno Date: Sun, 9 Feb 2014 20:10:31 +0000 Subject: [PATCH] Revert "Stop running manage-projects" This reverts commit 3f9175647745c9e84b4516439ef7d0c67c3335a1 --- modules/openstack_project/manifests/gerrit.pp | 15 +++++++++++++++ modules/openstack_project/manifests/review.pp | 4 +--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp index ed19c087a6..d051220e07 100644 --- a/modules/openstack_project/manifests/gerrit.pp +++ b/modules/openstack_project/manifests/gerrit.pp @@ -370,6 +370,21 @@ 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 b41ea18ff2..e860c13988 100644 --- a/modules/openstack_project/manifests/review.pp +++ b/modules/openstack_project/manifests/review.pp @@ -183,9 +183,7 @@ class openstack_project::review ( user => 'gerritbot', vhost_name => $::fqdn, } - class { 'gerrit::remotes': - ensure => absent, - } + include gerrit::remotes file { '/home/gerrit2/.ssh': ensure => directory,