From: Stephen Gran <steve@lobefin.net>
Date: Sun, 12 Jan 2014 10:51:38 +0000 (+0000)
Subject: automatic permissions as well
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1517f5e59bda6b8e85df9efad0a52f91afec5e68;p=mirror%2Fdsa-puppet.git

automatic permissions as well

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

diff --git a/modules/rabbitmq/manifests/autouser.pp b/modules/rabbitmq/manifests/autouser.pp
index 9e1462887..90758b780 100644
--- a/modules/rabbitmq/manifests/autouser.pp
+++ b/modules/rabbitmq/manifests/autouser.pp
@@ -18,4 +18,15 @@ define rabbitmq::autouser () {
 		password => $rabbit_password,
 		provider => 'rabbitmqctl',
 	}
+
+	rabbitmq_user_permissions { "${name}@dsa":
+		configure_permission => '.*',
+		read_permission      => '.*',
+		write_permission     => '.*',
+		provider             => 'rabbitmqctl',
+		require              => [
+			Rabbitmq_user[$name],
+			Rabbitmq_vhost['dsa']
+		]
+	}
 }
diff --git a/modules/roles/manifests/pubsub/entities.pp b/modules/roles/manifests/pubsub/entities.pp
index 2a8901026..5248bbc75 100644
--- a/modules/roles/manifests/pubsub/entities.pp
+++ b/modules/roles/manifests/pubsub/entities.pp
@@ -196,28 +196,6 @@ class roles::pubsub::entities {
 		]
 	}
 
-	rabbitmq_user_permissions { 'mailly@dsa':
-		configure_permission => '.*',
-		read_permission      => '.*',
-		write_permission     => '.*',
-		provider             => 'rabbitmqctl',
-		require              => [
-			Rabbitmq_user['mailly'],
-			Rabbitmq_vhost['dsa']
-		]
-	}
-
-	rabbitmq_user_permissions { 'muffat@dsa':
-		configure_permission => '.*',
-		read_permission      => '.*',
-		write_permission     => '.*',
-		provider             => 'rabbitmqctl',
-		require              => [
-			Rabbitmq_user['muffat'],
-			Rabbitmq_vhost['dsa']
-		]
-	}
-
 	rabbitmq_user_permissions { 'pet-devel@pet':
 		configure_permission => '.*',
 		read_permission      => '.*',