projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ports mirrors
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
pubsub
/
client.pp
diff --git
a/modules/roles/manifests/pubsub/client.pp
b/modules/roles/manifests/pubsub/client.pp
index
fab5cfd
..
1c236a1
100644
(file)
--- a/
modules/roles/manifests/pubsub/client.pp
+++ b/
modules/roles/manifests/pubsub/client.pp
@@
-8,14
+8,34
@@
#
class roles::pubsub::client {
#
class roles::pubsub::client {
- $rabbit_password = hkdf('/etc/puppet/secret', "mq-client-${::fqdn}")
+ include roles::pubsub::parameters
- file { '/etc/dsa/pubsub.conf':
- content => template('roles/pubsub/pubsub.conf.erb'),
- mode => '0440'
+ $rabbit_password = $roles::pubsub::parameters::rabbit_password
+
+ package { [
+ 'python-dsa-mq',
+ 'python-kombu'
+ ]:
+ ensure => installed,
+ tag => extra_repo,
+ }
+
+ roles::pubsub::config { 'homedirs':
+ key => 'dsa-homedirs',
+ exchange => dsa,
+ topic => 'dsa.git.homedirs',
+ vhost => dsa,
+ username => $::fqdn,
+ password => $rabbit_password
}
}
- package { 'python-dsa-mq':
- ensure => latest
+ roles::pubsub::config { 'replicate':
+ key => 'dsa-udreplicate',
+ exchange => dsa,
+ queue => "ud-${::fqdn}",
+ topic => 'dsa.ud.replicate',
+ vhost => dsa,
+ username => $::fqdn,
+ password => $rabbit_password
}
}
}
}