Clean up Qpid certificate deployment

theforeman · Feb 11, 2021 · 6d6e71b · 6d6e71b
1 parent 6fc79f4
commit 6d6e71b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 104 deletions.
diff --git a/manifests/foreman_proxy_content.pp b/manifests/foreman_proxy_content.pp
@@ -30,9 +30,8 @@
   class { 'certs::apache':        hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
   class { 'certs::qpid':          hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
   class { 'certs::qpid_router':   hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
-  class { 'certs::qpid_client':   hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
 
   certs::tar_create { $certs_tar:
-    subscribe => Class['certs::puppet', 'certs::foreman', 'certs::foreman_proxy', 'certs::qpid', 'certs::qpid_router', 'certs::apache', 'certs::qpid_client'],
+    subscribe => Class['certs::puppet', 'certs::foreman', 'certs::foreman_proxy', 'certs::qpid', 'certs::qpid_router', 'certs::apache'],
   }
 }
diff --git a/manifests/qpid.pp b/manifests/qpid.pp
@@ -18,8 +18,6 @@
   $nss_cert_name        = 'broker',
 ) inherits certs {
 
-  Exec { logoutput => 'on_failure' }
-
   $qpid_cert_name = "${hostname}-qpid-broker"
 
   cert { $qpid_cert_name:
@@ -77,11 +75,13 @@
       command     => "openssl pkcs12 -in ${client_cert} -inkey ${client_key} -export -out '${pfx_path}' -password 'file:${nss_db_password_file}' -name '${nss_cert_name}'",
       path        => '/usr/bin',
       refreshonly => true,
+      logoutput   => 'on_failure',
     } ~>
     exec { 'add-private-key-to-nss-db':
       command     => "pk12util -i '${pfx_path}' -d '${nss_db_dir}' -w '${nss_db_password_file}' -k '${nss_db_password_file}'",
       path        => '/usr/bin',
       refreshonly => true,
+      logoutput   => 'on_failure',
     }
   }
 }
diff --git a/manifests/qpid_client.pp b/manifests/qpid_client.pp
diff --git a/spec/classes/certs_qpid_client_spec.rb b/spec/classes/certs_qpid_client_spec.rb