From fa78401181e5033d7f063e4c0a510822e5231cc6 Mon Sep 17 00:00:00 2001
From: "Elizabeth K. Joseph" <lyz@princessleia.com>
Date: Fri, 9 Sep 2016 14:43:51 -0700
Subject: [PATCH] Add Twitter account details to our statusbot

Change-Id: I62c767eeab472ac79bf18ba0177ed80b08dbf8fa
Depends-on: Ia861189ea10d0056afb43fe6a6fd1e51d4ffb4bf
---
 manifests/site.pp                             |  7 +++-
 .../openstack_project/manifests/eavesdrop.pp  | 33 ++++++++++++-------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 9fc6bd5808..d03382f47b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -332,7 +332,12 @@ node 'eavesdrop.openstack.org' {
     # https://wiki.openstack.org/wiki/Successes
     statusbot_wiki_successpageid => '7717',
     statusbot_irclogs_url   => 'http://eavesdrop.openstack.org/irclogs/%(chan)s/%(chan)s.%(date)s.log.html',
-    accessbot_nick          => hiera('accessbot_nick', 'username'),
+    statusbot_twitter                 => true,
+    statusbot_twitter_key             => hiera('statusbot_twitter_key'),
+    statusbot_twitter_secret          => hiera('statusbot_twitter_secret'),
+    statusbot_twitter_token_key       => hiera('statusbot_twitter_token_key'),
+    statusbot_twitter_token_secret    => hiera('statusbot_twitter_token_secret'),
+    statusbot_accessbot_nick          => hiera('accessbot_nick', 'username'),
     accessbot_password      => hiera('accessbot_nick_password'),
     meetbot_channels        => hiera('meetbot_channels', ['openstack-infra']),
   }
diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp
index fa96c2b31e..b0c0a28ad3 100644
--- a/modules/openstack_project/manifests/eavesdrop.pp
+++ b/modules/openstack_project/manifests/eavesdrop.pp
@@ -13,6 +13,12 @@ class openstack_project::eavesdrop (
   $statusbot_wiki_pageid = '',
   $statusbot_wiki_successpageid = '',
   $statusbot_irclogs_url = '',
+  $statusbot_twitter = undef,
+  $statusbot_twitter_key = '',
+  $statusbot_twitter_secret = '',
+  $statusbot_twitter_token_key = '',
+  $statusbot_twitter_token_secret = '',
+  $statusbot_accessbot_nick = '',
   $accessbot_nick = '',
   $accessbot_password = '',
   $project_config_repo = '',
@@ -39,17 +45,22 @@ class openstack_project::eavesdrop (
   }
 
   class { 'statusbot':
-    nick          => $statusbot_nick,
-    password      => $statusbot_password,
-    server        => $statusbot_server,
-    channels      => $statusbot_channels,
-    auth_nicks    => $statusbot_auth_nicks,
-    wiki_user     => $statusbot_wiki_user,
-    wiki_password => $statusbot_wiki_password,
-    wiki_url      => $statusbot_wiki_url,
-    wiki_pageid   => $statusbot_wiki_pageid,
-    wiki_successpageid => $statusbot_wiki_successpageid,
-    irclogs_url   => $statusbot_irclogs_url,
+    nick                 => $statusbot_nick,
+    password             => $statusbot_password,
+    server               => $statusbot_server,
+    channels             => $statusbot_channels,
+    auth_nicks           => $statusbot_auth_nicks,
+    wiki_user            => $statusbot_wiki_user,
+    wiki_password        => $statusbot_wiki_password,
+    wiki_url             => $statusbot_wiki_url,
+    wiki_pageid          => $statusbot_wiki_pageid,
+    wiki_successpageid   => $statusbot_wiki_successpageid,
+    irclogs_url          => $statusbot_irclogs_url,
+    twitter              => $statusbot_twitter,
+    twitter_key          => $statusbot_twitter_key,
+    twitter_secret       => $statusbot_twitter_secret,
+    twitter_token_key    => $statusbot_twitter_token_key,
+    twitter_token_secret => $statusbot_twitter_token_secret,
   }
 
   file { '/srv/meetbot-openstack/alert':