Merge pull request #78 from johnpmitsch/pulp_parent_removal

Fixes #14188 - change pulp_parent to qpid_client class

manifests/capsule.pp

@@ -26,7 +26,7 @@
   class { '::certs::apache':        hostname => $capsule_fqdn }
   class { '::certs::qpid':          hostname => $capsule_fqdn }
   class { '::certs::qpid_router':   hostname => $capsule_fqdn }
-  class { '::certs::pulp_child':    hostname => $capsule_fqdn }
+  class { '::certs::qpid_client':   hostname => $capsule_fqdn }
 
   if $certs_tar {
     certs::tar_create { $certs_tar:
@@ -36,7 +36,7 @@
                     Class['certs::qpid'],
                     Class['certs::qpid_router'],
                     Class['certs::apache'],
-                    Class['certs::pulp_child']],
+                    Class['certs::qpid_client']],
     }
   }
 }

manifests/qpid_client.pp

@@ -0,0 +1,44 @@
+# Pulp Master Certs configuration
+class certs::qpid_client (
+
+  $hostname   = $::certs::node_fqdn,
+  $generate   = $::certs::generate,
+  $regenerate = $::certs::regenerate,
+  $deploy     = $::certs::deploy,
+
+  $messaging_client_cert = $certs::params::messaging_client_cert
+
+  ) {
+
+  cert { "${hostname}-qpid-client-cert":
+    hostname      => $hostname,
+    common_name   => 'pulp-qpid-client-cert',
+    purpose       => client,
+    country       => $::certs::country,
+    state         => $::certs::state,
+    city          => $::certs::city,
+    org           => 'PULP',
+    org_unit      => $::certs::org_unit,
+    expiration    => $::certs::expiration,
+    ca            => $::certs::default_ca,
+    generate      => $generate,
+    regenerate    => $regenerate,
+    deploy        => $deploy,
+    password_file => $certs::ca_key_password_file,
+  }
+
+  if $deploy {
+
+    Cert["${hostname}-qpid-client-cert"] ~>
+    key_bundle { $messaging_client_cert:
+      key_pair => Cert["${hostname}-qpid-client-cert"],
+    } ~>
+    file { $messaging_client_cert:
+      owner => 'apache',
+      group => 'apache',
+      mode  => '0640',
+    }
+
+  }
+
+}