From b97f2fa3830cc3c0231eafed7d9af6e7502a2e62 Mon Sep 17 00:00:00 2001 From: akumari Date: Mon, 3 Jun 2024 17:47:54 +0530 Subject: [PATCH] Add facts_match_regex paramter in katello class --- manifests/candlepin.pp | 4 ++++ manifests/init.pp | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/manifests/candlepin.pp b/manifests/candlepin.pp index 4db6e9a6..f550c801 100644 --- a/manifests/candlepin.pp +++ b/manifests/candlepin.pp @@ -24,6 +24,8 @@ # Artemis. It should still be signed by the correct Certificate Authority. # @param loggers # Configure the Candlepin loggers +# @param facts_match_regex +# Configure the Candlepin facts_match_regex class katello::candlepin ( Stdlib::Host $db_host = 'localhost', Optional[Stdlib::Port] $db_port = undef, @@ -36,6 +38,7 @@ Boolean $manage_db = true, Variant[Undef, Deferred, String[1]] $artemis_client_dn = undef, Hash[String[1], Candlepin::LogLevel] $loggers = {}, + Optional[String[1]] $facts_match_regex = undef, ) { include certs include katello::params @@ -73,6 +76,7 @@ db_ssl_ca => $db_ssl_ca, manage_db => $manage_db, loggers => $loggers, + facts_match_regex => $facts_match_regex, subscribe => Class['certs', 'certs::candlepin'], } -> anchor { 'katello::candlepin': } # lint:ignore:anchor_resource diff --git a/manifests/init.pp b/manifests/init.pp index 822da21a..0e16d2e1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -31,6 +31,8 @@ # # $candlepin_loggers:: Configure the Candlepin loggers # +# $candlepin_facts_match_regex:: Configure the Candlepin facts_match_regex +# # $rest_client_timeout:: Timeout for Katello rest API # # $hosts_queue_workers:: Configures the number of workers handling the hosts_queue queue. @@ -38,9 +40,8 @@ class katello ( Optional[String] $candlepin_oauth_key = undef, Optional[String] $candlepin_oauth_secret = undef, - Integer[0] $rest_client_timeout = 3600, - + Optional[String[1]] $facts_match_regex = undef, String $candlepin_db_host = 'localhost', Optional[Stdlib::Port] $candlepin_db_port = undef, String $candlepin_db_name = 'candlepin', @@ -51,6 +52,7 @@ Optional[Stdlib::Absolutepath] $candlepin_db_ssl_ca = undef, Boolean $candlepin_manage_db = true, Hash[String[1], Candlepin::LogLevel] $candlepin_loggers = {}, + Optional[String[1]] $candlepin_facts_match_regex = undef, Integer[0] $hosts_queue_workers = 1, ) { @@ -82,5 +84,6 @@ manage_db => $candlepin_manage_db, artemis_client_dn => $katello::application::artemis_client_dn, loggers => $candlepin_loggers, + facts_match_regex => $candlepin_facts_match_regex, } }