From 2c62001610ba34a92b56c5abcc0145eee7d355be Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 12 Jan 2014 18:51:33 +0000 Subject: [PATCH] pubsub client config Signed-off-by: Stephen Gran --- manifests/site.pp | 1 + modules/roles/manifests/pubsub/client.pp | 16 ++++++++++++++++ modules/roles/templates/pubsub/pubsub.conf.erb | 6 ++++++ modules/samhain/templates/samhainrc.erb | 2 ++ 4 files changed, 25 insertions(+) create mode 100644 modules/roles/manifests/pubsub/client.pp create mode 100644 modules/roles/templates/pubsub/pubsub.conf.erb diff --git a/manifests/site.pp b/manifests/site.pp index eecf27cd..3d46f4ee 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -39,6 +39,7 @@ node default { include autofs include lvm include multipath + include roles::pubsub::client if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] { include ganeti2 diff --git a/modules/roles/manifests/pubsub/client.pp b/modules/roles/manifests/pubsub/client.pp new file mode 100644 index 00000000..3335ffe3 --- /dev/null +++ b/modules/roles/manifests/pubsub/client.pp @@ -0,0 +1,16 @@ +# = Class: roles::pubsub::client +# +# Client config files for pubsub client +# +# == Sample Usage: +# +# include roles::pubsub::client +# +class roles::pubsub::client { + + $rabbit_password = hkdf('/etc/puppet/secret', "mq-client-${name}") + + file { '/etc/dsa/pubsub.conf': + content => template('roles/pubsub/pubsub.conf.erb') + } +} diff --git a/modules/roles/templates/pubsub/pubsub.conf.erb b/modules/roles/templates/pubsub/pubsub.conf.erb new file mode 100644 index 00000000..0852463d --- /dev/null +++ b/modules/roles/templates/pubsub/pubsub.conf.erb @@ -0,0 +1,6 @@ +[dsa-homedirs] +vhost=dsa +topic=dsa.git.homedirs +exchange=dsa +username=<%= @fqdn %> +password=<%= @rabbit_password %> diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index cecc4ccd..e88a9ba1 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -116,6 +116,7 @@ file=/etc/static-clients.conf # timestamps. Put it here as 'file', and in the ReadOnly section as 'dir'. # file=/etc +file=/etc/dsa file=/etc/ssh file=/etc/network/run file=/etc/bind/zones @@ -250,6 +251,7 @@ file=/etc/blkid.tab.old file=/etc/resolv.conf.dhclient-new # We handle these files with puppet - please to not be bothering us +file=/etc/dsa/pubsub.conf file=/etc/nsswitch.conf file=/etc/timezone file=/etc/motd.tail -- 2.39.2