diff --git a/manifests/plugin/pulp.pp b/manifests/plugin/pulp.pp index b57f95c7e..f7f656448 100644 --- a/manifests/plugin/pulp.pp +++ b/manifests/plugin/pulp.pp @@ -17,6 +17,8 @@ # # $pulpcore_content_url:: The URL to the Pulp 3 content # +# $client_authentication:: An array of client authentication types supported by the Pulp installation. +# class foreman_proxy::plugin::pulp ( Foreman_proxy::ListenOn $listen_on = 'https', Boolean $pulpcore_enabled = true, @@ -24,6 +26,7 @@ Stdlib::HTTPUrl $pulpcore_api_url = $foreman_proxy::plugin::pulp::params::pulpcore_api_url, Stdlib::HTTPUrl $pulpcore_content_url = $foreman_proxy::plugin::pulp::params::pulpcore_content_url, Optional[String] $version = undef, + Boolean $client_authentication = ['client_certificate'], ) inherits foreman_proxy::plugin::pulp::params { foreman_proxy::plugin {'pulp': diff --git a/spec/classes/foreman_proxy__plugin__pulp_spec.rb b/spec/classes/foreman_proxy__plugin__pulp_spec.rb index b7f458aa9..9ddd694e4 100644 --- a/spec/classes/foreman_proxy__plugin__pulp_spec.rb +++ b/spec/classes/foreman_proxy__plugin__pulp_spec.rb @@ -22,7 +22,8 @@ ':enabled: https', ":pulp_url: https://#{facts[:fqdn]}", ":content_app_url: https://#{facts[:fqdn]}/pulp/content", - ':mirror: false' + ':mirror: false', + ':certificate_common_name_auth: true', ]) end @@ -49,6 +50,7 @@ pulpcore_mirror: true, pulpcore_api_url: 'https://pulpcore.example.com', pulpcore_content_url: 'https://pulpcore.example.com/pulp/content', + certificate_common_name_auth: false, } end @@ -61,7 +63,8 @@ ':enabled: https', ':pulp_url: https://pulpcore.example.com', ":content_app_url: https://pulpcore.example.com/pulp/content", - ':mirror: true' + ':mirror: true', + ':certificate_common_name_auth: false', ]) end end diff --git a/templates/plugin/pulpcore.yml.erb b/templates/plugin/pulpcore.yml.erb index 4ff06cc09..c9ceec8ae 100644 --- a/templates/plugin/pulpcore.yml.erb +++ b/templates/plugin/pulpcore.yml.erb @@ -3,3 +3,4 @@ :pulp_url: <%= scope.lookupvar("foreman_proxy::plugin::pulp::pulpcore_api_url") %> :content_app_url: <%= scope.lookupvar("foreman_proxy::plugin::pulp::pulpcore_content_url") %> :mirror: <%= scope.lookupvar("foreman_proxy::plugin::pulp::pulpcore_mirror") %> +:certificate_common_name_auth: <%= scope.lookupvar("foreman_proxy::plugin::pulp::certificate_common_name_auth") %>