X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub%2Fentities.pp;h=5248bbc75254a67794eb755814ab0d9124803f9c;hb=1d58862054f8e4aff11a0c94a1276e38f4740972;hp=3d7d9cd5cdd90e6c7865a1d8f5e22a74d358e743;hpb=3a60a768acef6d465a955e702ed44512ae9ded5b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub/entities.pp b/modules/roles/manifests/pubsub/entities.pp
index 3d7d9cd5c..5248bbc75 100644
--- a/modules/roles/manifests/pubsub/entities.pp
+++ b/modules/roles/manifests/pubsub/entities.pp
@@ -60,12 +60,16 @@ class roles::pubsub::entities {
 		provider => 'rabbitmqctl',
 	}
 
-	rabbitmq_user { 'pet':
+	rabbitmq_user { 'pet-devel':
 		admin    => false,
 		password => $pet_password,
 		provider => 'rabbitmqctl',
 	}
 
+	$do_hosts = keys($site::localinfo)
+
+	rabbitmq::autouser { $do_hosts: }
+
 	rabbitmq_vhost { 'packages':
 		ensure   => present,
 		provider => 'rabbitmqctl',
@@ -127,6 +131,17 @@ class roles::pubsub::entities {
 		]
 	}
 
+	rabbitmq_user_permissions { 'admin@pet':
+		configure_permission => '.*',
+		read_permission      => '.*',
+		write_permission     => '.*',
+		provider             => 'rabbitmqctl',
+		require              => [
+			Rabbitmq_user['admin'],
+			Rabbitmq_vhost['pet']
+		]
+	}
+
 	rabbitmq_user_permissions { 'ftpteam@packages':
 		configure_permission => '.*',
 		read_permission      => '.*',
@@ -181,35 +196,13 @@ 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@pet':
+	rabbitmq_user_permissions { 'pet-devel@pet':
 		configure_permission => '.*',
 		read_permission      => '.*',
 		write_permission     => '.*',
 		provider             => 'rabbitmqctl',
 		require              => [
-			Rabbitmq_user['pet'],
+			Rabbitmq_user['pet-devel'],
 			Rabbitmq_vhost['pet']
 		]
 	}