Refs #28924: Drop qpid client configuration used by older katello-qpid

theforeman · May 1, 2020 · 5c9c1be · 5c9c1be
1 parent 05604d3
commit 5c9c1be
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 47 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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