Split generate and deploy config into separate classes

Author: ehelms

manifests/apache.pp

@@ -120,6 +120,8 @@
   }
 
   if $deploy {
+    include certs::config::deploy
+
     certs::keypair { $apache_cert_name:
       source_dir => "${certs::ssl_build_dir}/${hostname}",
       key_file   => $apache_key,

manifests/ca.pp

@@ -60,6 +60,8 @@
   }
 
   if $deploy {
+    include certs::config::deploy
+
     file { $certs::katello_default_ca_cert:
       ensure => file,
       source => $default_ca_path,

manifests/config.pp renamed to manifests/config/deploy.pp

@@ -1,16 +1,9 @@
-# @summary Basic directory structure
+# @summary Directory structure for certificates deployed into the pki_dir
 # @api private
-class certs::config (
+class certs::config::deploy (
   Stdlib::Absolutepath $pki_dir = $certs::pki_dir,
   String $group = $certs::group,
 ) {
-  file { $certs::ssl_build_dir:
-    ensure => directory,
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0700',
-  }
-
   file { $pki_dir:
     ensure => directory,
     owner  => 'root',

manifests/config/generate.pp

@@ -0,0 +1,11 @@
+# @summary Basic directory structure for certificate generation
+# @api private
+class certs::config::generate (
+) {
+  file { $certs::ssl_build_dir:
+    ensure => directory,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0700',
+  }
+}

manifests/foreman_proxy.pp

@@ -107,6 +107,8 @@
   }
 
   if $deploy {
+    include certs::config::deploy
+
     certs::keypair { $proxy_cert_name:
       source_dir => "${certs::ssl_build_dir}/${hostname}",
       key_file   => $proxy_key,

manifests/init.pp

@@ -115,11 +115,11 @@
   }
 
   contain certs::install
-  contain certs::config
+  contain certs::config::generate
   contain certs::ca
 
   Class['certs::install'] ->
-  Class['certs::config'] ->
+  Class['certs::config::generate'] ->
   Class['certs::ca']
 
   $default_ca = Ca[$default_ca_name]

manifests/puppet.pp

@@ -39,6 +39,8 @@
   }
 
   if $deploy {
+    include certs::config::deploy
+
     file { "${pki_dir}/puppet":
       ensure => directory,
       owner  => $owner,

spec/classes/certs_spec.rb

@@ -8,7 +8,7 @@
       end
 
       it { should contain_class('certs::install') }
-      it { should contain_class('certs::config') }
+      it { should contain_class('certs::config::generate') }
     end
   end
 end