Fixes #7802 - fixes katello-devel user missing from qpidd group

modules/katello/manifests/qpid.pp

@@ -2,12 +2,13 @@
 class katello::qpid (
   $client_cert            = undef,
   $client_key             = undef,
-  $katello_user           = undef
+  $katello_user           = $katello::user
 ){
   if $katello_user == undef {
     fail('katello_user not defined')
   } else {
-    User<|title == $katello_user|>{groups +> $certs::qpidd_group}
+    Group['qpidd'] ->
+    User<|title == $katello_user|>{groups +> 'qpidd'}
   }
   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",

modules/katello/spec/classes/katello_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 
 describe 'katello' do
-
  context 'on redhat' do
+   let(:params) do
+     {:user => 'foreman'}
+   end
     let :facts do
       {
         :concat_basedir             => '/tmp',
@@ -17,6 +19,25 @@
       ['include foreman','include certs']
     end
 
+    it { should contain_class('katello::install') }
+    it { should contain_class('katello::config') }
+    it { should contain_class('katello::service') }
+  end
+ context 'on oel' do
+    let :facts do
+      {
+        :concat_basedir             => '/tmp',
+        :operatingsystem            => 'OracleLinux',
+        :operatingsystemrelease     => '6.5',
+        :operatingsystemmajrelease  => '6.5',
+        :osfamily                   => 'RedHat',
+      }
+    end
+
+    let(:pre_condition) do
+      ['include foreman','include certs']
+    end
+
     it { should contain_class('katello::install') }
     it { should contain_class('katello::config') }
     it { should contain_class('katello::service') }

modules/katello_devel/manifests/init.pp

@@ -105,12 +105,6 @@
 
   Class['certs'] ~>
   Class['certs::qpid'] ~>
-  class { 'qpid::client': } ~>
-  class { 'katello::qpid':
-    client_cert  => $certs::qpid::client_cert,
-    client_key   => $certs::qpid::client_key,
-    katello_user => $user
-  } ~>
   class { 'certs::pulp_parent': } ~>
   class { 'pulp':
     oauth_key                   => $katello_devel::oauth_key,
@@ -124,6 +118,12 @@
     consumers_ca_key            => $certs::ca_key,
     consumers_crl               => $candlepin::crl_file,
   } ~>
+  class { 'qpid::client': } ~>
+  class { 'katello::qpid':
+    client_cert  => $certs::qpid::client_cert,
+    client_key   => $certs::qpid::client_key,
+    katello_user => $user
+  } ~>
   class { 'crane':
     cert    => $certs::ca_cert,
     key     => $certs::ca_key,

modules/qpid/manifests/config.pp

@@ -4,7 +4,10 @@
 #
 class qpid::config {
 
-  user { 'qpidd':
+  group { $qpid::group:
+    ensure => present
+  } ->
+  user { $qpid::user:
     ensure => present,
     groups => [$qpid::user_groups],
   }

modules/qpid/manifests/params.pp

@@ -9,4 +9,7 @@
 
   $user_groups = []
 
+  $user = 'qpidd'
+  $group = 'qpidd'
+
 }