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 9e14628874866fc0b5e665b9c91f08ab4a3f099d..90758b78082bf9fef45a82761b774647f8c0620f 100644 (file)
--- 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 2a8901026e34ca85aed5488eb086c1b90677fffe..5248bbc75254a67794eb755814ab0d9124803f9c 100644 (file)
--- 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      => '.*',