Skip to content

Commit

Permalink
Construct foreman_url from servername and drop parameter
Browse files Browse the repository at this point in the history
Drops the foreman_url parameter and constructs it from the servername
given to Apache. The foreman_url and servername should match
and this gives one less parameter that needs to be configured to get
a correct installation.
  • Loading branch information
ehelms committed Aug 19, 2021
1 parent 172a16d commit 569e445
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
#
# === Advanced parameters:
#
# $foreman_url:: URL on which foreman is going to run
#
# $unattended:: Should Foreman manage host provisioning as well
#
# $unattended_url:: URL hosts will retrieve templates from during build (normally http as many installers don't support https)
Expand Down Expand Up @@ -193,7 +191,6 @@
# $keycloak_realm:: The realm as passed to keycloak-httpd-client-install
#
class foreman (
Stdlib::HTTPUrl $foreman_url = $foreman::params::foreman_url,
Boolean $unattended = $foreman::params::unattended,
Optional[Stdlib::HTTPUrl] $unattended_url = $foreman::params::unattended_url,
Boolean $apache = $foreman::params::apache,
Expand Down Expand Up @@ -296,6 +293,8 @@
timeout => 0,
}

$foreman_url = "https://${foreman::servername}"

include foreman::install
include foreman::config
include foreman::database
Expand Down

0 comments on commit 569e445

Please sign in to comment.