Merge "Revert "Stop running manage-projects""

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,

modules/openstack_project/manifests/review.pp

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