Remove Qpid

theforeman · Mar 20, 2024 · d26aa37 · d26aa37
1 parent 88f8f33
commit d26aa37
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 71 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
diff --git 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