theforeman · ehelms · Jul 8, 2022 · Jul 8, 2022
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Currently Supported modules:
  * BMC - BMC management of devices supported by freeipmi and ipmitool
  * DHCP - ISC DHCP and MS DHCP Servers
  * DNS - Bind and MS DNS Servers
- * Puppet - Any Puppet server from 4.4, 6+ recommended
+ * Puppet - Puppetserver 6 or 7
  * Puppet CA - Manage certificate signing, cleaning and autosign on a Puppet CA server
  * Realm - Manage host registration to a realm (e.g. FreeIPA)
  * TFTP - any UNIX based tftp server

diff --git a/config/settings.d/puppetca.yml.example b/config/settings.d/puppetca.yml.example
@@ -6,6 +6,3 @@
 #   - puppetca_hostname_whitelisting (verify CSRs based on a hostname whitelist)
 #   - puppetca_token_whitelisting (verify CSRs based on a token whitelist)
 #:use_provider: puppetca_hostname_whitelisting
-
-# Puppet version used
-#:puppet_version: '4.1'
diff --git a/config/settings.d/puppetca_puppet_cert.yml.example b/config/settings.d/puppetca_puppet_cert.yml.example
diff --git a/lib/smart_proxy_main.rb b/lib/smart_proxy_main.rb
@@ -63,7 +63,6 @@ module Proxy
   require 'dhcp_libvirt/dhcp_libvirt'
   require 'puppetca/puppetca'
   require 'puppetca_http_api/puppetca_http_api'
-  require 'puppetca_puppet_cert/puppetca_puppet_cert'
   require 'puppetca_hostname_whitelisting/puppetca_hostname_whitelisting'
   require 'puppetca_token_whitelisting/puppetca_token_whitelisting'
   require 'puppet_proxy/puppet'

diff --git a/modules/puppetca/plugin_configuration.rb b/modules/puppetca/plugin_configuration.rb
@@ -6,11 +6,9 @@ def load_classes
     end
 
     def load_programmable_settings(settings)
-      raise ::Proxy::Error::ConfigurationError, "Parameter ':puppet_version' is expected to have a non-empty value" if settings[:puppet_version].to_s.empty?
-
       use_provider = settings[:use_provider]
       use_provider = [use_provider].compact unless use_provider.is_a?(Array)
-      use_provider << ((Gem::Version.new(settings[:puppet_version].to_s) >= Gem::Version.new('6.0')) ? :puppetca_http_api : :puppetca_puppet_cert)
+      use_provider << :puppetca_http_api
       settings[:use_provider] = use_provider
 
       settings

diff --git a/modules/puppetca_puppet_cert/plugin_configuration.rb b/modules/puppetca_puppet_cert/plugin_configuration.rb
diff --git a/modules/puppetca_puppet_cert/puppetca_impl.rb b/modules/puppetca_puppet_cert/puppetca_impl.rb
diff --git a/modules/puppetca_puppet_cert/puppetca_puppet_cert.rb b/modules/puppetca_puppet_cert/puppetca_puppet_cert.rb
diff --git a/modules/puppetca_puppet_cert/puppetca_puppet_cert_plugin.rb b/modules/puppetca_puppet_cert/puppetca_puppet_cert_plugin.rb
diff --git a/test/puppet/integration_test.rb b/test/puppet/integration_test.rb
@@ -18,7 +18,7 @@ def test_features
     ssl_key = Tempfile.new('ssl_key')
 
     begin
-      Proxy::DefaultModuleLoader.any_instance.expects(:load_configuration_file).with('puppet.yml').returns(enabled: true, puppet_version: '5.5.8')
+      Proxy::DefaultModuleLoader.any_instance.expects(:load_configuration_file).with('puppet.yml').returns(enabled: true)
       Proxy::DefaultModuleLoader.any_instance.expects(:load_configuration_file).with('puppet_proxy_puppet_api.yml').returns(
         puppet_url: 'https://puppet.example.com:8140',
         puppet_ssl_ca: ssl_ca.path,

diff --git a/test/puppetca/puppetca_config_test.rb b/test/puppetca/puppetca_config_test.rb
diff --git a/test/puppetca_http_api/integration_test.rb b/test/puppetca_http_api/integration_test.rb
@@ -19,7 +19,7 @@ def test_features
     ssl_key = Tempfile.new('ssl_key')
 
     begin
-      Proxy::DefaultModuleLoader.any_instance.expects(:load_configuration_file).with('puppetca.yml').returns(enabled: true, puppet_version: '6.0.0')
+      Proxy::DefaultModuleLoader.any_instance.expects(:load_configuration_file).with('puppetca.yml').returns(enabled: true)
       Proxy::DefaultModuleLoader.any_instance.expects(:load_configuration_file).with('puppetca_hostname_whitelisting.yml').returns({})
       Proxy::DefaultModuleLoader.any_instance.expects(:load_configuration_file).with('puppetca_http_api.yml').returns(
         puppet_url: 'https://puppet.example.com:8140',

diff --git a/test/puppetca_puppet_cert/fixtures/ca/ca_crl.pem b/test/puppetca_puppet_cert/fixtures/ca/ca_crl.pem
diff --git a/test/puppetca_puppet_cert/fixtures/ca/inventory.txt b/test/puppetca_puppet_cert/fixtures/ca/inventory.txt
diff --git a/test/puppetca_puppet_cert/fixtures/puppet b/test/puppetca_puppet_cert/fixtures/puppet
diff --git a/test/puppetca_puppet_cert/fixtures/sudo b/test/puppetca_puppet_cert/fixtures/sudo
diff --git a/test/puppetca_puppet_cert/puppetca_puppet_cert_config_test.rb b/test/puppetca_puppet_cert/puppetca_puppet_cert_config_test.rb