er, this should be a variable

[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 3d7d9cd5cdd90e6c7865a1d8f5e22a74d358e743..2a8901026e34ca85aed5488eb086c1b90677fffe 100644 (file)
--- 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      => '.*',
@@ -203,13 +218,13 @@ class roles::pubsub::entities {
                ]
        }
 
-       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']
                ]
        }