Fixes #7802 - allow user to be passed into qpid module

theforeman · Oct 3, 2014 · 4f6ee8d · 4f6ee8d
1 parent dafdf02
commit 4f6ee8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -96,8 +96,9 @@
   } ~>
   class { 'qpid::client': } ~>
   class { 'katello::qpid':
-    client_cert => $certs::qpid::client_cert,
-    client_key  => $certs::qpid::client_key,
+    client_cert  => $certs::qpid::client_cert,
+    client_key   => $certs::qpid::client_key,
+    katello_user => $katello::user,
   } ~>
   class{ 'elasticsearch': } ~>
   Exec['foreman-rake-db:seed']

diff --git a/manifests/qpid.pp b/manifests/qpid.pp
@@ -2,9 +2,10 @@
 class katello::qpid (
   $client_cert            = undef,
   $client_key             = undef,
+  $katello_user           = $katello::params::user
 ){
 
-  User<|title == $katello::user|>{groups +> $certs::qpidd_group}
+  User<|title == $katello_user|>{groups +> $certs::qpidd_group}
   exec { 'create katello entitlments queue':
     command   => "qpid-config --ssl-certificate ${katello::qpid::client_cert} --ssl-key ${katello::qpid::client_key} -b 'amqps://${::fqdn}:5671' add queue ${katello::params::candlepin_event_queue} --durable",
     unless    => "qpid-config --ssl-certificate ${katello::qpid::client_cert} --ssl-key ${katello::qpid::client_key} -b 'amqps://${::fqdn}:5671' queues ${katello::params::candlepin_event_queue}",