From: Stephen Gran <steve@lobefin.net>
Date: Mon, 26 Aug 2013 20:32:58 +0000 (+0100)
Subject: add build user & vhost
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d7e050f56b61ddc883f8328f17933d1d1f94dc9a;p=mirror%2Fdsa-puppet.git

add build user & vhost

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 2b4abf944..94a5116eb 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -1,9 +1,10 @@
 class roles::pubsub {
 	include roles::pubsub::params
 
-	$cluster_cookie = $roles::pubsub::params::cluster_cookie
-	$admin_password = $roles::pubsub::params::admin_password
-	$ftp_password   = $roles::pubsub::params::ftp_password
+	$cluster_cookie  = $roles::pubsub::params::cluster_cookie
+	$admin_password  = $roles::pubsub::params::admin_password
+	$ftp_password    = $roles::pubsub::params::ftp_password
+	$buildd_password = $roles::pubsub::params::ftp_password
 	$cc_master      = rainier
 	$cc_secondary   = rapoport
 
@@ -45,6 +46,21 @@ class roles::pubsub {
 		provider => 'rabbitmqctl',
 	}
 
+	rabbitmq_vhost { 'buildd':
+		ensure   => present,
+		provider => 'rabbitmqctl',
+	}
+
+	rabbitmq_user_permissions { 'admin@buildd':
+		configure_permission => '.*',
+		read_permission      => '.*',
+		write_permission     => '.*',
+		provider             => 'rabbitmqctl',
+		require              => [
+			Rabbitmq_user['admin'],
+			Rabbitmq_vhost['buildd']
+		]
+	}
 	rabbitmq_user_permissions { 'admin@packages':
 		configure_permission => '.*',
 		read_permission      => '.*',
@@ -75,6 +91,24 @@ class roles::pubsub {
 		]
 	}
 
+	rabbitmq_user_permissions { 'buildd@buildd':
+		configure_permission => '.*',
+		read_permission      => '.*',
+		write_permission     => '.*',
+		provider             => 'rabbitmqctl',
+		require              => [
+			Rabbitmq_user['buildd'],
+			Rabbitmq_vhost['buildd']
+		]
+	}
+
+	rabbitmq_policy { 'mirror-buildd':
+		vhost   => 'buildd',
+		match   => '.*',
+		policy  => '{"ha-mode":"all"}',
+		require => Rabbitmq_vhost['buildd']
+	}
+
 	rabbitmq_policy { 'mirror-packages':
 		vhost   => 'packages',
 		match   => '.*',