X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fgit_master.pp;h=a432f0265c508edd38881770c923e761d438d32c;hb=add63b4edd7236df5114ae7fc84c3ff984cc0de0;hp=a265ed26720c207c2d355b54e7443521c6d377ec;hpb=76790b983062c130c7a9442c44cd169ef25c4161;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/git_master.pp b/modules/roles/manifests/git_master.pp index a265ed267..a432f0265 100644 --- a/modules/roles/manifests/git_master.pp +++ b/modules/roles/manifests/git_master.pp @@ -7,17 +7,16 @@ # include roles::git_master # class roles::git_master { + include roles::pubsub::parameters - include roles::pubsub::parameters + $rabbit_password = $roles::pubsub::parameters::rabbit_password - $rabbit_password = $roles::pubsub::parameters::rabbit_password - - roles::pubsub::config { 'emailvdomains': - key => 'dsa-emailvdomains', - exchange => dsa, - topic => 'dsa.email.update', - vhost => dsa, - username => $::fqdn, - password => $rabbit_password - } + roles::pubsub::config { 'emailvdomains': + key => 'dsa-emailvdomains', + exchange => dsa, + topic => 'dsa.email.update', + vhost => dsa, + username => $::fqdn, + password => $rabbit_password + } }