From a7a423ce6cbf174b12d91ce4c1261497950c9257 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 1 Jul 2020 10:45:58 +0200
Subject: [PATCH] Drop puppetca_split_configs parameter

Since module version 13 this module is Foreman 2.0+ which means we must
always use split configs. That makes this parameter redundant.
---
 manifests/config.pp        | 5 +----
 manifests/init.pp          | 4 ----
 manifests/params.pp        | 1 -
 templates/puppetca.yml.erb | 5 -----
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index a8eba89b..86a28b1f 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -78,10 +78,7 @@
   contain foreman_proxy::module::puppetca
   foreman_proxy::provider { ['puppetca_hostname_whitelisting', 'puppetca_token_whitelisting']:
   }
-
-  if $foreman_proxy::puppetca_split_configs {
-    foreman_proxy::provider { ['puppetca_http_api', 'puppetca_puppet_cert']:
-    }
+  foreman_proxy::provider { ['puppetca_http_api', 'puppetca_puppet_cert']:
   }
 
   contain foreman_proxy::module::realm
diff --git a/manifests/init.pp b/manifests/init.pp
index f11e7a58..615c0664 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -292,9 +292,6 @@
 #
 # $httpboot_listen_on::         HTTPBoot proxy to listen on https, http, or both
 #
-# $puppetca_split_configs::     Whether to split the puppetca configs. This is only supported on 1.22+.
-#                               Set to false for older versions.
-#
 # $puppetca_provider::          Whether to use puppetca_hostname_whitelisting or puppetca_token_whitelisting
 #
 # $puppetca_sign_all::          Token-whitelisting only: Whether to sign all CSRs without checking their token
@@ -331,7 +328,6 @@
   Boolean $use_sudoersd = $foreman_proxy::params::use_sudoersd,
   Boolean $use_sudoers = $foreman_proxy::params::use_sudoers,
   Boolean $puppetca = $foreman_proxy::params::puppetca,
-  Boolean $puppetca_split_configs = $foreman_proxy::params::puppetca_split_configs,
   Foreman_proxy::ListenOn $puppetca_listen_on = $foreman_proxy::params::puppetca_listen_on,
   Stdlib::Absolutepath $ssldir = $foreman_proxy::params::ssldir,
   Stdlib::Absolutepath $puppetdir = $foreman_proxy::params::puppetdir,
diff --git a/manifests/params.pp b/manifests/params.pp
index a1c2e4dd..87f307fc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -182,7 +182,6 @@
 
   # puppetca settings
   $puppetca              = true
-  $puppetca_split_configs = true
   $puppetca_provider     = 'puppetca_hostname_whitelisting'
   $puppetca_listen_on    = 'https'
   $puppetca_cmd          = "${puppet_cmd} cert"
diff --git a/templates/puppetca.yml.erb b/templates/puppetca.yml.erb
index 7c15193a..0890e322 100644
--- a/templates/puppetca.yml.erb
+++ b/templates/puppetca.yml.erb
@@ -2,16 +2,11 @@
 # PuppetCA management
 # Can be true, false, or http/https to enable just one of the protocols
 :enabled: <%= @module_enabled %>
-<% unless scope.lookupvar("foreman_proxy::puppetca_split_configs") -%>
-:ssldir: <%= scope.lookupvar("foreman_proxy::ssldir") %>
-<% end -%>
 
 # valid providers:
 #   - puppetca_hostname_whitelisting (verify CSRs based on a hostname whitelist)
 #   - puppetca_token_whitelisting (verify CSRs based on a token whitelist)
 :use_provider: <%= scope.lookupvar("foreman_proxy::puppetca_provider") %>
-<% if scope.lookupvar("foreman_proxy::puppetca_split_configs") -%>
 
 # Puppet version used
 :puppet_version: <%= @puppetversion %>
-<% end -%>