From 5c9c1bee34032bb369c069ad4c9a8e85cc99b076 Mon Sep 17 00:00:00 2001
From: "Eric D. Helms" <ericdhelms@gmail.com>
Date: Mon, 27 Apr 2020 10:03:12 -0400
Subject: [PATCH] Refs #28924: Drop qpid client configuration used by older
 katello-qpid

---
 manifests/application.pp         |  5 -----
 manifests/pulp.pp                |  1 +
 manifests/qpid_client.pp         | 19 -------------------
 spec/classes/application_spec.rb |  1 -
 spec/classes/init_spec.rb        |  1 -
 spec/classes/qpid_client_spec.rb | 21 ---------------------
 6 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 manifests/qpid_client.pp
 delete mode 100644 spec/classes/qpid_client_spec.rb

diff --git a/manifests/application.pp b/manifests/application.pp
index 3fdb5a0f..445e91c5 100644
--- a/manifests/application.pp
+++ b/manifests/application.pp
@@ -24,12 +24,8 @@
   include certs::candlepin
   include certs::foreman
   include certs::pulp_client
-  include certs::qpid
   include katello::params
 
-  include katello::qpid_client
-  User<|title == $foreman::user|>{groups +> 'qpidd'}
-
   foreman_config_entry { 'pulp_client_cert':
     value          => $certs::pulp_client::client_cert,
     ignore_missing => false,
@@ -45,7 +41,6 @@
   include foreman::plugin::tasks
 
   Class['certs', 'certs::ca', 'certs::apache'] ~> Class['apache::service']
-  Class['certs', 'certs::ca', 'certs::qpid'] ~> Class['foreman::plugin::tasks']
 
   # Used in katello.yaml.erb
   $enable_ostree = $katello::params::enable_ostree
diff --git a/manifests/pulp.pp b/manifests/pulp.pp
index 9d073593..26e6a5a4 100644
--- a/manifests/pulp.pp
+++ b/manifests/pulp.pp
@@ -84,6 +84,7 @@
 ) {
   include katello::params
   include certs
+  include certs::qpid
 
   class { 'certs::qpid_client':
     require => Class['pulp::install'],
diff --git a/manifests/qpid_client.pp b/manifests/qpid_client.pp
deleted file mode 100644
index 3f6fc3ee..00000000
--- a/manifests/qpid_client.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-# @summary Install and configure a qpid client.
-# @api private
-#
-# This is used by the Katello Rails app to connect to the
-# qpid message broker as well as Pulp
-class katello::qpid_client {
-  include certs
-  include certs::qpid
-
-  class { 'qpid::client':
-    ssl                    => true,
-    ssl_cert_name          => $certs::qpid::nss_cert_name,
-    ssl_cert_db            => $certs::qpid::nss_db_dir,
-    ssl_cert_password_file => $certs::qpid::nss_db_password_file,
-    require                => Class['certs', 'certs::qpid'],
-  }
-
-  contain qpid::client
-}
diff --git a/spec/classes/application_spec.rb b/spec/classes/application_spec.rb
index 53a9a45b..7e01fb91 100644
--- a/spec/classes/application_spec.rb
+++ b/spec/classes/application_spec.rb
@@ -20,7 +20,6 @@ class { 'katello::params':
         it { is_expected.not_to create_package('tfm-rubygem-katello').that_requires('Anchor[katello::candlepin]') }
         it { is_expected.to create_package('rh-postgresql12-postgresql-evr') }
         it { is_expected.to contain_class('certs::qpid') }
-        it { is_expected.to contain_class('katello::qpid_client') }
 
         it do
           is_expected.to create_foreman_config_entry('pulp_client_cert')
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index 045e7c69..5492253d 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -9,7 +9,6 @@
       it { is_expected.to contain_class('katello::candlepin') }
       it { is_expected.to contain_class('katello::application') }
       it { is_expected.to contain_class('katello::pulp') }
-      it { is_expected.to contain_class('katello::qpid_client') }
       it { is_expected.to contain_class('katello::qpid') }
 
       it { is_expected.to contain_package('tfm-rubygem-katello').that_requires('Class[candlepin]') }
diff --git a/spec/classes/qpid_client_spec.rb b/spec/classes/qpid_client_spec.rb
deleted file mode 100644
index 7b7091c8..00000000
--- a/spec/classes/qpid_client_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe 'katello::qpid_client' do
-  on_supported_os.each do |os, facts|
-    context "on #{os}" do
-      let(:facts) { facts }
-
-      it { is_expected.to compile.with_all_deps }
-      it { is_expected.to contain_class('certs::qpid') }
-
-      it do
-        is_expected.to create_class('qpid::client')
-          .with_ssl(true)
-          .with_ssl_cert_name('broker')
-          .with_ssl_cert_db('/etc/pki/katello/nssdb')
-          .with_ssl_cert_password_file('/etc/pki/katello/nssdb/nss_db_password-file')
-          .that_requires('Class[Certs::Qpid]')
-      end
-    end
-  end
-end