Refs #36573 - Drop default value for foreman_url

This default matches what's in theforeman/puppetserver_foreman and is not needed. Users can still override it, but the default just duplicates things.
theforeman · Jul 7, 2023 · 2107e88 · 2107e88
1 parent c947152
commit 2107e88
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -693,7 +693,7 @@
   Boolean $server_strict_variables = $puppet::params::server_strict_variables,
   Hash[String, Data] $server_additional_settings = $puppet::params::server_additional_settings,
   Boolean $server_foreman = $puppet::params::server_foreman,
-  Stdlib::HTTPUrl $server_foreman_url = $puppet::params::server_foreman_url,
+  Optional[Stdlib::HTTPUrl] $server_foreman_url = $puppet::params::server_foreman_url,
   Optional[Stdlib::Absolutepath] $server_foreman_ssl_ca = $puppet::params::server_foreman_ssl_ca,
   Optional[Stdlib::Absolutepath] $server_foreman_ssl_cert = $puppet::params::server_foreman_ssl_cert,
   Optional[Stdlib::Absolutepath] $server_foreman_ssl_key = $puppet::params::server_foreman_ssl_key,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -329,7 +329,7 @@
     true  => '/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet',
     false => undef,
   }
-  $server_foreman_url      = "https://${lower_fqdn}"
+  $server_foreman_url      = undef
   $server_foreman_ssl_ca   = undef
   $server_foreman_ssl_cert = undef
   $server_foreman_ssl_key  = undef

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -404,7 +404,7 @@
   Boolean $strict_variables = $puppet::server_strict_variables,
   Hash[String, Data] $additional_settings = $puppet::server_additional_settings,
   Boolean $foreman = $puppet::server_foreman,
-  Stdlib::HTTPUrl $foreman_url = $puppet::server_foreman_url,
+  Optional[Stdlib::HTTPUrl] $foreman_url = $puppet::server_foreman_url,
   Optional[Stdlib::Absolutepath] $foreman_ssl_ca = $puppet::server_foreman_ssl_ca,
   Optional[Stdlib::Absolutepath] $foreman_ssl_cert = $puppet::server_foreman_ssl_cert,
   Optional[Stdlib::Absolutepath] $foreman_ssl_key = $puppet::server_foreman_ssl_key,