diff --git a/lib/puppet/functions/foreman/enc.rb b/lib/puppet/functions/foreman/enc.rb index 5f7000c45..37f372474 100644 --- a/lib/puppet/functions/foreman/enc.rb +++ b/lib/puppet/functions/foreman/enc.rb @@ -45,14 +45,6 @@ def enc(url, certname) ssl_context = use_ssl ? Puppet.lookup(:ssl_context) : nil conn = Puppet::Network::HttpPool.connection(uri.host, uri.port, use_ssl: use_ssl, ssl_context: ssl_context) - # Puppetserver doesn't implement HTTP auth on get requests - # https://tickets.puppetlabs.com/browse/SERVER-2597 - if defined?(Puppet::Server::HttpClient) && conn.is_a?(Puppet::Server::HttpClient) && options[:basic_auth] - require 'base64' - encoded = Base64.strict_encode64("#{options[:basic_auth][:user]}:#{options[:basic_auth][:password]}") - headers["Authorization"] = "Basic #{encoded}" - end - path = uri.path path += "?#{uri.query}" if uri.query response = conn.get(path, headers, options) diff --git a/metadata.json b/metadata.json index 8a2d84c7d..897b091d1 100644 --- a/metadata.json +++ b/metadata.json @@ -48,7 +48,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 5.5.8 < 8.0.0" + "version_requirement": ">= 6.15.0 < 8.0.0" } ], "operatingsystem_support": [