X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub%2Fclient.pp;h=1c236a17796aaebcc78bc24c4c48c23f3d5e8dbc;hb=3d1e20d9385fd27268e268d7d022b86ac6c905c5;hp=41c57b53fa64a8155579bd375d213d09946f72de;hpb=52bd6246ce28db656f0c7750b03bdb415f6fdbb6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub/client.pp b/modules/roles/manifests/pubsub/client.pp
index 41c57b53f..1c236a177 100644
--- a/modules/roles/manifests/pubsub/client.pp
+++ b/modules/roles/manifests/pubsub/client.pp
@@ -8,15 +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':
-		ensure => latest,
+	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
+	}
+
+	roles::pubsub::config { 'replicate':
+		key      => 'dsa-udreplicate',
+		exchange => dsa,
+		queue    => "ud-${::fqdn}",
+		topic    => 'dsa.ud.replicate',
+		vhost    => dsa,
+		username => $::fqdn,
+		password => $rabbit_password
+	}
 }