From 9360fc52fa9c59ebcea18ceb869953677128e44f Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Tue, 4 Aug 2026 15:00:32 +0200 Subject: [PATCH] Use certs directly instead of a keystore for Candlepin Co-authored-by: Eric D. Helms --- manifests/candlepin.pp | 6 ++---- spec/setup_acceptance_node.pp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/manifests/candlepin.pp b/manifests/candlepin.pp index 64b4f8a9..475ff482 100644 --- a/manifests/candlepin.pp +++ b/manifests/candlepin.pp @@ -52,10 +52,8 @@ oauth_secret => $katello::params::candlepin_oauth_secret, ca_key => $certs::candlepin::ca_key, ca_cert => $certs::candlepin::ca_cert, - keystore_file => $certs::candlepin::keystore, - keystore_password => $certs::candlepin::keystore_password, - truststore_file => $certs::candlepin::truststore, - truststore_password => $certs::candlepin::truststore_password, + certificate_file => $certs::candlepin::tomcat_cert, + certificate_key_file => $certs::candlepin::tomcat_key, java_home => '/usr/lib/jvm/jre-25', java_package => 'java-25-openjdk', enable_basic_auth => false, diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp index da533b88..975c30e5 100644 --- a/spec/setup_acceptance_node.pp +++ b/spec/setup_acceptance_node.pp @@ -5,7 +5,7 @@ repo_version => 'nightly', } class { 'candlepin::repo': - version => 'nightly', + version => '4.8', } group { 'foreman':