X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub%2Fclient.pp;h=1c236a17796aaebcc78bc24c4c48c23f3d5e8dbc;hb=906a3243ed81ccb850e494ea880045084fbaeb35;hp=fab5cfd422299d9da72d39174a2ed7d5d5e3f95d;hpb=4edbc8335d0bd9eb3465c3bd42465eebb951c297;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub/client.pp b/modules/roles/manifests/pubsub/client.pp
index fab5cfd42..1c236a177 100644
--- a/modules/roles/manifests/pubsub/client.pp
+++ b/modules/roles/manifests/pubsub/client.pp
@@ -8,14 +8,34 @@
 #
 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
 	}
 }