diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp index 17130541e5..06bebfff8b 100644 --- a/modules/openstack_project/manifests/gerrit.pp +++ b/modules/openstack_project/manifests/gerrit.pp @@ -374,6 +374,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 c84d304759..f38a968639 100644 --- a/modules/openstack_project/manifests/review.pp +++ b/modules/openstack_project/manifests/review.pp @@ -188,9 +188,7 @@ class openstack_project::review ( user => 'gerritbot', vhost_name => $::fqdn, } - class { 'gerrit::remotes': - ensure => absent, - } + include gerrit::remotes file { '/home/gerrit2/.launchpadlib': ensure => directory,