From d26aa37a135c741235b178fbebaab3cacc706c47 Mon Sep 17 00:00:00 2001
From: "Eric D. Helms" <ericdhelms@gmail.com>
Date: Wed, 21 Feb 2024 13:55:24 -0500
Subject: [PATCH] Remove Qpid

---
 .fixtures.yml                |  1 -
 README.md                    |  2 +-
 manifests/init.pp            |  4 +---
 manifests/qpid.pp            | 10 ----------
 metadata.json                |  4 ----
 spec/acceptance/qpid_spec.rb | 32 --------------------------------
 spec/classes/init_spec.rb    |  1 -
 spec/classes/qpid_spec.rb    | 19 -------------------
 8 files changed, 2 insertions(+), 71 deletions(-)
 delete mode 100644 manifests/qpid.pp
 delete mode 100644 spec/acceptance/qpid_spec.rb
 delete mode 100644 spec/classes/qpid_spec.rb

diff --git a/.fixtures.yml b/.fixtures.yml
index 5c53146a..1bd00ba8 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -13,7 +13,6 @@ fixtures:
     extlib:        "https://github.com/voxpupuli/puppet-extlib"
     foreman:       "https://github.com/theforeman/puppet-foreman.git"
     postgresql:    "https://github.com/puppetlabs/puppetlabs-postgresql.git"
-    qpid:          "https://github.com/theforeman/puppet-qpid.git"
     redis:         "https://github.com/voxpupuli/puppet-redis"
     selinux:       "https://github.com/voxpupuli/puppet-selinux.git"
     selinux_core:
diff --git a/README.md b/README.md
index 3cc4026a..b17ed778 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## Overview
 
-This module is designed to setup a Katello server, including Candlepin and, if katello-agent is enabled, qpid.
+This module is designed to setup a Katello server, including Candlepin.
 
 ## Development
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 20d49db6..822da21a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,7 +28,7 @@
 # $candlepin_db_ssl_ca:: The CA certificate to verify the SSL connection to the database with
 #
 # $candlepin_manage_db:: Boolean indicating whether a database should be installed, this includes db creation and user
-# 
+#
 # $candlepin_loggers:: Configure the Candlepin loggers
 #
 # $rest_client_timeout:: Timeout for Katello rest API
@@ -83,6 +83,4 @@
     artemis_client_dn => $katello::application::artemis_client_dn,
     loggers           => $candlepin_loggers,
   }
-
-  class { 'katello::qpid': }
 }
diff --git a/manifests/qpid.pp b/manifests/qpid.pp
deleted file mode 100644
index 685af526..00000000
--- a/manifests/qpid.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# @summary Katello qpid Config
-#
-class katello::qpid {
-  class { 'qpid':
-    ensure => 'absent',
-    ssl    => false,
-  }
-
-  contain qpid
-}
diff --git a/metadata.json b/metadata.json
index b01fd8d1..5ab48118 100644
--- a/metadata.json
+++ b/metadata.json
@@ -28,10 +28,6 @@
       "name": "katello/certs",
       "version_requirement": ">= 15.0.0 < 18.0.0"
     },
-    {
-      "name": "katello/qpid",
-      "version_requirement": ">= 8.0.0 < 12.0.0"
-    },
     {
       "name": "theforeman/foreman",
       "version_requirement": ">= 17.0.0 < 25.0.0"
diff --git a/spec/acceptance/qpid_spec.rb b/spec/acceptance/qpid_spec.rb
deleted file mode 100644
index b78caf60..00000000
--- a/spec/acceptance/qpid_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'Uninstall qpid' do
-  before(:context) { purge_katello }
-
-  context 'with default parameters' do
-    it_behaves_like 'an idempotent resource' do
-      let(:manifest) do
-        <<-PUPPET
-        include katello::qpid
-        PUPPET
-      end
-    end
-
-    describe service('qpidd') do
-      it { is_expected.not_to be_running }
-      it { is_expected.not_to be_enabled }
-    end
-
-    describe port('5671') do
-      it { is_expected.not_to be_listening }
-    end
-
-    describe port('5672') do
-      it { is_expected.not_to be_listening }
-    end
-
-    describe package('qpid-cpp-server') do
-      it { is_expected.not_to be_installed }
-    end
-  end
-end
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index 25272d09..91aec0ab 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -8,7 +8,6 @@
       it { is_expected.to compile.with_all_deps }
       it { is_expected.to contain_class('katello::candlepin').with_artemis_client_dn('CN=foo.example.com, OU=PUPPET, O=FOREMAN, ST=North Carolina, C=US') }
       it { is_expected.to contain_class('katello::application') }
-      it { is_expected.to contain_class('katello::qpid') }
       it { is_expected.to contain_package('rubygem-katello').that_requires('Class[candlepin]') }
       it { is_expected.to contain_package('katello') }
     end
diff --git a/spec/classes/qpid_spec.rb b/spec/classes/qpid_spec.rb
deleted file mode 100644
index 922e27b1..00000000
--- a/spec/classes/qpid_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe 'katello::qpid' do
-  on_supported_os.each do |os, facts|
-    context "on #{os}" do
-      let(:facts) { facts }
-
-      context 'with default parameters' do
-        it do
-          is_expected.to create_class('qpid')
-            .with_ensure('absent')
-            .with_ssl(false)
-        end
-
-        it { is_expected.not_to create_qpid__config__queue('katello.agent') }
-      end
-    end
-  end
-end