projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
41cd6f5
)
add build user & vhost
author
Stephen Gran
<steve@lobefin.net>
Mon, 26 Aug 2013 20:32:58 +0000
(21:32 +0100)
committer
Stephen Gran
<steve@lobefin.net>
Mon, 26 Aug 2013 20:32:58 +0000
(21:32 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/roles/manifests/pubsub.pp
patch
|
blob
|
history
diff --git
a/modules/roles/manifests/pubsub.pp
b/modules/roles/manifests/pubsub.pp
index
2b4abf9
..
94a5116
100644
(file)
--- a/
modules/roles/manifests/pubsub.pp
+++ b/
modules/roles/manifests/pubsub.pp
@@
-1,9
+1,10
@@
class roles::pubsub {
include roles::pubsub::params
class roles::pubsub {
include roles::pubsub::params
- $cluster_cookie = $roles::pubsub::params::cluster_cookie
- $admin_password = $roles::pubsub::params::admin_password
- $ftp_password = $roles::pubsub::params::ftp_password
+ $cluster_cookie = $roles::pubsub::params::cluster_cookie
+ $admin_password = $roles::pubsub::params::admin_password
+ $ftp_password = $roles::pubsub::params::ftp_password
+ $buildd_password = $roles::pubsub::params::ftp_password
$cc_master = rainier
$cc_secondary = rapoport
$cc_master = rainier
$cc_secondary = rapoport
@@
-45,6
+46,21
@@
class roles::pubsub {
provider => 'rabbitmqctl',
}
provider => 'rabbitmqctl',
}
+ rabbitmq_vhost { 'buildd':
+ ensure => present,
+ provider => 'rabbitmqctl',
+ }
+
+ rabbitmq_user_permissions { 'admin@buildd':
+ configure_permission => '.*',
+ read_permission => '.*',
+ write_permission => '.*',
+ provider => 'rabbitmqctl',
+ require => [
+ Rabbitmq_user['admin'],
+ Rabbitmq_vhost['buildd']
+ ]
+ }
rabbitmq_user_permissions { 'admin@packages':
configure_permission => '.*',
read_permission => '.*',
rabbitmq_user_permissions { 'admin@packages':
configure_permission => '.*',
read_permission => '.*',
@@
-75,6
+91,24
@@
class roles::pubsub {
]
}
]
}
+ rabbitmq_user_permissions { 'buildd@buildd':
+ configure_permission => '.*',
+ read_permission => '.*',
+ write_permission => '.*',
+ provider => 'rabbitmqctl',
+ require => [
+ Rabbitmq_user['buildd'],
+ Rabbitmq_vhost['buildd']
+ ]
+ }
+
+ rabbitmq_policy { 'mirror-buildd':
+ vhost => 'buildd',
+ match => '.*',
+ policy => '{"ha-mode":"all"}',
+ require => Rabbitmq_vhost['buildd']
+ }
+
rabbitmq_policy { 'mirror-packages':
vhost => 'packages',
match => '.*',
rabbitmq_policy { 'mirror-packages':
vhost => 'packages',
match => '.*',