X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub%2Fentities.pp;h=d0dfd621c603f5612b8bb778e506ec3bb6fc47bc;hb=48a7fe9cc927439d6e472b1b9939f72a4a7f4aa8;hp=d0c13f2b78bb0b09c5f3f60a36496eafc92bf11b;hpb=abf5299108b021bebf2fb9cd7519898e3baf29bd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub/entities.pp b/modules/roles/manifests/pubsub/entities.pp
index d0c13f2b7..d0dfd621c 100644
--- a/modules/roles/manifests/pubsub/entities.pp
+++ b/modules/roles/manifests/pubsub/entities.pp
@@ -58,6 +58,10 @@ class roles::pubsub::entities {
 		password => $pet_password,
 	}
 
+	$do_hosts = keys($site::localinfo)
+
+	pubsub::autouser { $do_hosts: }
+
 	rabbitmq_vhost { 'packages':
 		ensure   => present,
 	}
@@ -111,8 +115,8 @@ class roles::pubsub::entities {
 	}
 
 	rabbitmq_user_permissions { 'wbadm@packages':
-		read_permission      => 'unchecked',
-		write_permission     => 'wbadm',
+		read_permission  => 'unchecked',
+		write_permission => 'wbadm',
 	}
 
 	rabbitmq_user_permissions { 'buildd@buildd':
@@ -179,9 +183,6 @@ class roles::pubsub::entities {
 		},
 	}
 
-	rabbitmq_plugin { 'rabbitmq_management':
-		ensure   => present,
-	}
 	rabbitmq_plugin { 'rabbitmq_management_agent':
 		ensure   => present,
 	}