Do not let foreman_proxy_content inherit from params

theforeman · Sep 26, 2018 · e331477 · e331477
1 parent 89880a7
commit e331477
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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