From 180308970e970b0bd24652fa70f6dec1ef8637f8 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Fri, 19 Sep 2014 18:13:26 -0700
Subject: [PATCH] Switch accessbot to project-config

Change-Id: Ie1e6416c0b6d70d647b3c3bcef8843cc06dc73f4
---
 manifests/site.pp                                | 1 +
 modules/openstack_project/manifests/eavesdrop.pp | 8 +++++++-
 modules/project_config/manifests/init.pp         | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 9e5adc9673..5da57d609b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -252,6 +252,7 @@ node 'planet.openstack.org' {
 # Node-OS: precise
 node 'eavesdrop.openstack.org' {
   class { 'openstack_project::eavesdrop':
+    project_config_repo     => 'https://git.openstack.org/openstack-infra/project-config',
     nickpass                => hiera('openstack_meetbot_password', 'XXX'),
     sysadmins               => hiera('sysadmins', []),
     statusbot_nick          => hiera('statusbot_nick', 'username'),
diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp
index 592c4519e1..417e2446a5 100644
--- a/modules/openstack_project/manifests/eavesdrop.pp
+++ b/modules/openstack_project/manifests/eavesdrop.pp
@@ -14,6 +14,7 @@ class openstack_project::eavesdrop (
   $statusbot_wiki_pageid = '',
   $accessbot_nick = '',
   $accessbot_password = '',
+  $project_config_repo = '',
 ) {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80],
@@ -97,10 +98,15 @@ class openstack_project::eavesdrop (
     ensure => present,
   }
 
+  class { 'project_config':
+    url  => $project_config_repo,
+  }
+
   class { 'accessbot':
     nick          => $accessbot_nick,
     password      => $accessbot_password,
     server        => $statusbot_server,
-    channel_file  => 'puppet:///modules/openstack_project/accessbot/channels.yaml',
+    channel_file  => $::project_config::accessbot_channels_yaml,
+    require       => $::project_config::config_dir,
   }
 }
diff --git a/modules/project_config/manifests/init.pp b/modules/project_config/manifests/init.pp
index bc3f55e660..a8a229305d 100644
--- a/modules/project_config/manifests/init.pp
+++ b/modules/project_config/manifests/init.pp
@@ -31,6 +31,7 @@ class project_config(
     }
   }
 
+  $accessbot_channels_yaml        = "/etc/project-config/${base}accessbot/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"