Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet

[dsa-puppet.git] / modules / roles / manifests / pubsub / entities.pp

diff --git a/modules/roles/manifests/pubsub/entities.pp b/modules/roles/manifests/pubsub/entities.pp
index 7d69d4a9db6652bf14cf44f280e4f312a5784fec..5248bbc75254a67794eb755814ab0d9124803f9c 100644 (file)
--- a/modules/roles/manifests/pubsub/entities.pp
+++ b/modules/roles/manifests/pubsub/entities.pp
@@ -66,6 +66,10 @@ class roles::pubsub::entities {
                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,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      => '.*',