candlepin: use own certs for qpid

theforeman · Sep 24, 2017 · 972467e · 972467e
1 parent 6c88e13
commit 972467e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/manifests/candlepin.pp b/manifests/candlepin.pp
@@ -14,9 +14,7 @@
   String $qpid_hostname = $::katello::qpid_hostname,
 ) {
   include ::certs
-  include ::certs::qpid
   include ::certs::candlepin
-  include ::katello::qpid_client
 
   class { '::candlepin':
     user_groups                  => $user_groups,
@@ -35,8 +33,8 @@
     amqp_keystore                => $::certs::candlepin::amqp_keystore,
     amqp_truststore              => $::certs::candlepin::amqp_truststore,
     qpid_hostname                => $qpid_hostname,
-    qpid_ssl_cert                => $::certs::qpid::client_cert,
-    qpid_ssl_key                 => $::certs::qpid::client_key,
+    qpid_ssl_cert                => $::certs::candlepin::client_cert,
+    qpid_ssl_key                 => $::certs::candlepin::client_key,
     db_host                      => $db_host,
     db_port                      => $db_port,
     db_name                      => $db_name,
@@ -45,7 +43,7 @@
     db_ssl                       => $db_ssl,
     db_ssl_verify                => $db_ssl_verify,
     manage_db                    => $manage_db,
-    subscribe                    => Class['certs', 'certs::qpid', 'certs::candlepin'],
+    subscribe                    => Class['certs', 'certs::candlepin'],
   }
 
   contain ::candlepin

diff --git a/spec/classes/katello_candlepin_spec.rb b/spec/classes/katello_candlepin_spec.rb
@@ -24,9 +24,7 @@
         end
 
         it { is_expected.to compile.with_all_deps }
-        it { is_expected.to contain_class('certs::qpid') }
         it { is_expected.to contain_class('certs::candlepin').that_notifies('Service[tomcat]') }
-        it { is_expected.to contain_class('katello::qpid_client') }
         it { is_expected.to contain_class('candlepin') }
       end
 
@@ -36,9 +34,7 @@
         end
 
         it { is_expected.to compile.with_all_deps }
-        it { is_expected.to contain_class('certs::qpid') }
         it { is_expected.to contain_class('certs::candlepin').that_notifies('Service[tomcat]') }
-        it { is_expected.to contain_class('katello::qpid_client') }
         it { is_expected.to contain_class('candlepin') }
       end
     end