From c635ad6c7c2198de0f9cb0a2c45eee90c241ae3b Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 3 Aug 2018 15:11:48 +0200 Subject: [PATCH] Do not let foreman_proxy_content inherit from params --- manifests/foreman_proxy_content.pp | 8 ++++---- manifests/params.pp | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/manifests/foreman_proxy_content.pp b/manifests/foreman_proxy_content.pp index 9bbdf427..abb2c1b2 100644 --- a/manifests/foreman_proxy_content.pp +++ b/manifests/foreman_proxy_content.pp @@ -13,10 +13,10 @@ # class certs::foreman_proxy_content ( String[1] $parent_fqdn = $::fqdn, - String $foreman_proxy_fqdn = $::certs::params::node_fqdn, - Array[String] $foreman_proxy_cname = $::certs::params::cname, - String[1] $certs_tar = $::certs::params::certs_tar, -) inherits certs::params { + String $foreman_proxy_fqdn = $::fqdn, + Array[String] $foreman_proxy_cname = [], + String[1] $certs_tar = undef, +) { if $foreman_proxy_fqdn == $::fqdn { fail('The hostname is the same as the provided hostname for the foreman-proxy') diff --git a/manifests/params.pp b/manifests/params.pp index 3c182ce3..e083754d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -66,7 +66,6 @@ $candlepin_amqp_truststore = "${candlepin_amqp_store_dir}/candlepin.truststore" $candlepin_amqp_keystore = "${candlepin_amqp_store_dir}/candlepin.jks" - $certs_tar = undef # Settings for uploading packages to Katello $katello_user = undef $katello_password = undef