Remove candlepin events(artemis)

manifests/application.pp

@@ -25,13 +25,8 @@
   $candlepin_oauth_key = $katello::params::candlepin_oauth_key
   $candlepin_oauth_secret = $katello::params::candlepin_oauth_secret
   $candlepin_ca_cert = $certs::foreman::ssl_ca_cert
-  $candlepin_events_ssl_cert = $certs::foreman::client_cert
-  $candlepin_events_ssl_key = $certs::foreman::client_key
   $manage_db = $foreman::db_manage
 
-  # Used in Candlepin
-  $artemis_client_dn = katello::build_dn([['CN', $certs::foreman::hostname], ['OU', $certs::foreman::org_unit], ['O', $certs::foreman::org], ['ST', $certs::foreman::state], ['C', $certs::foreman::country]])
-
   # Katello database seeding needs candlepin
   Anchor <| title == 'katello::repo' or title ==  'katello::candlepin' |> ->
   foreman::plugin { 'katello':

manifests/candlepin.pp

@@ -19,9 +19,6 @@
 #   The CA certificate to verify the SSL connection to the database with
 # @param manage_db
 #   Whether to manage the database. Set this to false when using a remote database
-# @param artemis_client_dn
-#   The Distinguished Name of the client certificate that's allowed to access
-#   Artemis. It should still be signed by the correct Certificate Authority.
 # @param loggers
 #   Configure the Candlepin loggers
 # @param facts_match_regex
@@ -36,7 +33,6 @@
   Boolean $db_ssl_verify = true,
   Optional[Stdlib::Absolutepath] $db_ssl_ca = undef,
   Boolean $manage_db = true,
-  Variant[Undef, Deferred, String[1]] $artemis_client_dn = undef,
   Hash[String[1], Candlepin::LogLevel] $loggers = {},
   Optional[String[1]] $facts_match_regex = undef,
 ) {
@@ -60,7 +56,6 @@
     keystore_password            => $certs::candlepin::keystore_password,
     truststore_file              => $certs::candlepin::truststore,
     truststore_password          => $certs::candlepin::truststore_password,
-    artemis_client_dn            => $artemis_client_dn,
     java_home                    => '/usr/lib/jvm/jre-17',
     java_package                 => 'java-17-openjdk',
     enable_basic_auth            => false,

manifests/init.pp

@@ -81,7 +81,6 @@
     db_ssl_verify     => $candlepin_db_ssl_verify,
     db_ssl_ca         => $candlepin_db_ssl_ca,
     manage_db         => $candlepin_manage_db,
-    artemis_client_dn => $katello::application::artemis_client_dn,
     loggers           => $candlepin_loggers,
     facts_match_regex => $candlepin_facts_match_regex,
   }

spec/acceptance/candlepin_spec.rb

@@ -19,12 +19,4 @@
   describe command('curl -k -s -o /dev/null -w \'%{http_code}\' https://localhost:23443/candlepin/status') do
     its(:stdout) { should eq "200" }
   end
-
-  describe file("/usr/share/tomcat/conf/cert-users.properties") do
-    it { should be_file }
-    it { should be_mode 640 }
-    it { should be_owned_by 'tomcat' }
-    it { should be_grouped_into 'tomcat' }
-    its(:content) { should eq("katelloUser=CN=ActiveMQ Artemis Client, OU=Artemis, O=ActiveMQ, L=AMQ, ST=AMQ, C=AMQ\n") }
-  end
 end

spec/acceptance/katello_spec.rb

@@ -54,8 +54,4 @@
   describe command('hammer --version') do
     its(:stdout) { is_expected.to match(/^hammer/) }
   end
-
-  describe file("/usr/share/tomcat/conf/cert-users.properties") do
-    its(:content) { should eq("katelloUser=CN=#{fact('fqdn')}, OU=PUPPET, O=FOREMAN, ST=North Carolina, C=US\n") }
-  end
 end

spec/classes/application_spec.rb

@@ -49,10 +49,6 @@ class { 'katello::params':
             '    :oauth_key: "katello"',
             '    :oauth_secret: "candlepin-secret"',
             '    :ca_cert_file: /etc/foreman/proxy_ca.pem',
-            '  :candlepin_events:',
-            '    :ssl_cert_file: /etc/foreman/client_cert.pem',
-            '    :ssl_key_file: /etc/foreman/client_key.pem',
-            '    :ssl_ca_file: /etc/foreman/proxy_ca.pem',
           ]
         end
 

spec/classes/init_spec.rb

@@ -6,7 +6,6 @@
       let(:facts) { facts }
 
       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_package('rubygem-katello').that_requires('Class[candlepin]') }
       it { is_expected.to contain_package('katello') }

templates/katello.yaml.erb

@@ -9,8 +9,3 @@
     :oauth_key: "<%= @candlepin_oauth_key %>"
     :oauth_secret: "<%= @candlepin_oauth_secret %>"
     :ca_cert_file: <%= @candlepin_ca_cert %>
-
-  :candlepin_events:
-    :ssl_cert_file: <%= @candlepin_events_ssl_cert %>
-    :ssl_key_file: <%= @candlepin_events_ssl_key %>
-    :ssl_ca_file: <%= @candlepin_ca_cert %>