From 9223b7961269490d9e70a9281da46f22b56123c8 Mon Sep 17 00:00:00 2001
From: Michael Krotscheck <krotscheck@gmail.com>
Date: Wed, 13 Aug 2014 14:48:11 -0700
Subject: [PATCH] Update storyboard version to include rabbitmq

This updates the version of storyboard that is used by infra to include
rabbitmq.

Change-Id: I8cbfb17715a75cf63dd60ad4bae24bc40b3a6944
---
 install_modules.sh                            |  3 ++-
 manifests/site.pp                             |  2 ++
 .../openstack_project/manifests/storyboard.pp | 24 ++++++++++++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/install_modules.sh b/install_modules.sh
index 45595ebe7e..e902cb3a36 100755
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -55,9 +55,10 @@ MODULES["puppetlabs-firewall"]="0.0.4"
 MODULES["puppetlabs-puppetdb"]="3.0.1"
 MODULES["stankevich-python"]="1.6.6"
 MODULES["example42-puppi"]="2.1.9"
+MODULES["puppetlabs-rabbitmq"]="4.0.0"
 
 SOURCE_MODULES["https://github.com/nibalizer/puppet-module-puppetboard"]="2.4.0"
-SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-storyboard"]="e4857b1a70d697cca2e8eedeb626a4422c705bdf"
+SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-storyboard"]="fb38fa63b3e7d9969d9130a46add4c24580cfc47"
 
 MODULE_LIST=`puppet module list`
 
diff --git a/manifests/site.pp b/manifests/site.pp
index ad7da44765..7e9a5292ca 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -400,6 +400,8 @@ node 'storyboard.openstack.org' {
     mysql_host              => hiera('storyboard_db_host', 'localhost'),
     mysql_user              => hiera('storyboard_db_user', 'username'),
     mysql_password          => hiera('storyboard_db_password', 'XXX'),
+    rabbitmq_user           => hiera('storyboard_rabbit_user', 'username'),
+    rabbitmq_password       => hiera('storyboard_rabbit_password', 'XXX'),
     ssl_cert_file_contents  => hiera('storyboard_ssl_cert_file_contents', 'XXX'),
     ssl_key_file_contents   => hiera('storyboard_ssl_key_file_contents', 'XXX'),
     ssl_chain_file_contents => hiera('storyboard_ssl_chain_file_contents', 'XXX')
diff --git a/modules/openstack_project/manifests/storyboard.pp b/modules/openstack_project/manifests/storyboard.pp
index 6369a15556..c173aa033b 100644
--- a/modules/openstack_project/manifests/storyboard.pp
+++ b/modules/openstack_project/manifests/storyboard.pp
@@ -4,6 +4,8 @@ class openstack_project::storyboard(
   $mysql_host = '',
   $mysql_password = '',
   $mysql_user = '',
+  $rabbitmq_user = 'storyboard',
+  $rabbitmq_password,
   $sysadmins = [],
   $ssl_cert_file_contents = undef,
   $ssl_key_file_contents = undef,
@@ -24,12 +26,22 @@ class openstack_project::storyboard(
   }
 
   class { '::storyboard::application':
-    hostname            => $::fqdn,
-    openid_url          => $openid_url,
-    mysql_host          => $mysql_host,
-    mysql_database      => 'storyboard',
-    mysql_user          => $mysql_user,
-    mysql_user_password => $mysql_password
+    hostname               => $::fqdn,
+    openid_url             => $openid_url,
+    mysql_host             => $mysql_host,
+    mysql_database         => 'storyboard',
+    mysql_user             => $mysql_user,
+    mysql_user_password    => $mysql_password,
+    rabbitmq_host          => 'localhost',
+    rabbitmq_port          => 5672,
+    rabbitmq_vhost         => '/',
+    rabbitmq_user          => $rabbitmq_user,
+    rabbitmq_user_password => $rabbitmq_password
+  }
+
+  class { '::storyboard::rabbit':
+    rabbitmq_user          => $rabbitmq_user,
+    rabbitmq_user_password => $rabbitmq_password
   }
 
   # Load the projects into the database.