From 7d07caccafec2756f63a4ff4648955a7a1b4f670 Mon Sep 17 00:00:00 2001
From: "Eric D. Helms" <ericdhelms@gmail.com>
Date: Wed, 21 Nov 2018 14:26:12 -0500
Subject: [PATCH] Move qpid client cert to /etc/pki/pulp

---
 manifests/params.pp                    |  5 ++++-
 manifests/qpid_client.pp               | 30 ++++++++++++++++++++------
 spec/classes/certs_qpid_client_spec.rb |  4 ++--
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index ffb543c9..ae5d74fa 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -73,7 +73,10 @@
   $katello_product        = 'node-certs'
   $katello_activation_key = undef
 
-  $messaging_client_cert = "${pki_dir}/qpid_client_striped.crt"
+  $pulp_pki_dir = '/etc/pki/pulp'
+
+  $qpid_client_cert = "${pulp_pki_dir}/qpid/client.crt"
+  $qpid_client_ca_cert = "${pulp_pki_dir}/qpid/ca.crt"
 
   $qpid_router_server_cert = "${pki_dir}/qpid_router_server.crt"
   $qpid_router_client_cert = "${pki_dir}/qpid_router_client.crt"
diff --git a/manifests/qpid_client.pp b/manifests/qpid_client.pp
index cfd2247b..8e55083c 100644
--- a/manifests/qpid_client.pp
+++ b/manifests/qpid_client.pp
@@ -6,7 +6,8 @@
   $regenerate            = $certs::regenerate,
   $deploy                = $certs::deploy,
 
-  $messaging_client_cert = $certs::messaging_client_cert,
+  $qpid_client_cert      = $certs::qpid_client_cert,
+  $qpid_client_ca_cert   = $certs::qpid_client_ca_cert,
 
   $country               = $certs::country,
   $state                 = $certs::state,
@@ -15,6 +16,8 @@
   $expiration            = $certs::expiration,
   $default_ca            = $certs::default_ca,
   $ca_key_password_file  = $certs::ca_key_password_file,
+
+  $cert_group            = 'apache',
 ) inherits certs {
 
   $qpid_client_cert_name = "${hostname}-qpid-client-cert"
@@ -39,16 +42,31 @@
 
   if $deploy {
 
+    file { $certs::pulp_pki_dir:
+      ensure => directory,
+      owner  => 'root',
+      group  => $cert_group,
+      mode   => '0640',
+    }
+
+    file { "${certs::pulp_pki_dir}/qpid":
+      ensure => directory,
+      owner  => 'root',
+      group  => $cert_group,
+      mode   => '0640',
+    } ~>
     Cert[$qpid_client_cert_name] ~>
-    key_bundle { $messaging_client_cert:
+    key_bundle { $qpid_client_cert:
       key_pair => Cert[$qpid_client_cert_name],
     } ~>
-    file { $messaging_client_cert:
-      owner => 'apache',
-      group => 'apache',
+    file { $qpid_client_cert:
+      owner => 'root',
+      group => $cert_group,
       mode  => '0640',
+    } ~>
+    pubkey { $qpid_client_ca_cert:
+      key_pair => $default_ca,
     }
-
   }
 
 }
diff --git a/spec/classes/certs_qpid_client_spec.rb b/spec/classes/certs_qpid_client_spec.rb
index 901cbc07..8d26494b 100644
--- a/spec/classes/certs_qpid_client_spec.rb
+++ b/spec/classes/certs_qpid_client_spec.rb
@@ -15,11 +15,11 @@
         end
 
         it do
-          is_expected.to contain_key_bundle('/etc/pki/katello/qpid_client_striped.crt')
+          is_expected.to contain_key_bundle('/etc/pki/pulp/qpid/client.crt')
             .with_key_pair('Cert[foo.example.com-qpid-client-cert]')
         end
 
-        it { is_expected.to contain_file('/etc/pki/katello/qpid_client_striped.crt') }
+        it { is_expected.to contain_file('/etc/pki/pulp/qpid/client.crt') }
       end
     end
   end