From 70cd379a2c9a7bf011e7ad0ff3e3f0aea092a3ba Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Fri, 19 Sep 2014 18:32:25 -0700
Subject: [PATCH] Switch gerritbot to project-config

Change-Id: I952a16dac32625e829d1fccb9e2472640cd31fd5
---
 modules/gerritbot/manifests/init.pp           | 3 ++-
 modules/openstack_project/manifests/review.pp | 2 ++
 modules/project_config/manifests/init.pp      | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/gerritbot/manifests/init.pp b/modules/gerritbot/manifests/init.pp
index b1d2c678b7..a4fa76ac5e 100644
--- a/modules/gerritbot/manifests/init.pp
+++ b/modules/gerritbot/manifests/init.pp
@@ -8,6 +8,7 @@ class gerritbot(
   $vhost_name = '',
   $ssh_rsa_key_contents = '',
   $ssh_rsa_pubkey_contents = '',
+  $channel_file = '',
 ) {
   include pip
 
@@ -56,7 +57,7 @@ class gerritbot(
     owner   => 'root',
     replace => true,
     require => User['gerrit2'],
-    source  => 'puppet:///modules/gerritbot/gerritbot_channel_config.yaml',
+    source  => $channel_file,
   }
 
   file { '/etc/gerritbot/logging.config':
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 47c0703d6a..b334b02226 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -201,6 +201,8 @@ class openstack_project::review (
     vhost_name              => $::fqdn,
     ssh_rsa_key_contents    => $gerritbot_ssh_rsa_key_contents,
     ssh_rsa_pubkey_contents => $gerritbot_ssh_rsa_pubkey_contents,
+    channel_file            => $::project_config::gerritbot_channel_file,
+    require                 => $::project_config::config_dir,
   }
   class { 'gerrit::remotes':
     ensure => absent,
diff --git a/modules/project_config/manifests/init.pp b/modules/project_config/manifests/init.pp
index c4f3ad2994..836b06c438 100644
--- a/modules/project_config/manifests/init.pp
+++ b/modules/project_config/manifests/init.pp
@@ -32,6 +32,7 @@ class project_config(
   }
 
   $accessbot_channels_yaml        = "/etc/project-config/${base}accessbot/channels.yaml"
+  $gerritbot_channel_file         = "/etc/project-config/${base}gerritbot/channels.yaml"
   $gerrit_acls_dir                = "/etc/project-config/${base}gerrit/acls"
   $gerrit_notify_impact_file      = "/etc/project-config/${base}gerrit/notify_impact.yaml"
   $jeepyb_project_file            = "/etc/project-config/${base}gerrit/projects.yaml"