Fixes #17380: Configure ca_cert_file for Candlepin communication

theforeman · Nov 18, 2016 · 744426d · 744426d
1 parent 406a6f1
commit 744426d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -71,6 +71,8 @@
   validate_bool($enable_ostree)
   validate_absolute_path($repo_export_dir)
 
+  $candlepin_ca_cert = $::certs::ca_cert
+
   Class['certs'] ~>
   class { '::certs::apache': } ~>
   class { '::katello::install': } ~>

diff --git a/spec/classes/katello_config_spec.rb b/spec/classes/katello_config_spec.rb
@@ -32,6 +32,7 @@
           '    :url: https://foo.example.com:8443/candlepin',
           '    :oauth_key: katello',
           '    :oauth_secret: secret',
+          '    :ca_cert_file: /etc/pki/katello/certs/katello-default-ca.crt',
           '  :pulp:',
           "    :url: https://#{facts[:fqdn]}/pulp/api/v2/",
           '    :oauth_key: katello',
@@ -70,6 +71,7 @@
           '    :url: https://foo.example.com:8443/candlepin',
           '    :oauth_key: katello',
           '    :oauth_secret: secret',
+          '    :ca_cert_file: /etc/pki/katello/certs/katello-default-ca.crt',
           '  :pulp:',
           "    :url: https://#{facts[:fqdn]}/pulp/api/v2/",
           '    :oauth_key: katello',

diff --git a/templates/katello.yaml.erb b/templates/katello.yaml.erb
@@ -13,6 +13,7 @@
     :url: <%= scope['katello::candlepin_url'] %>
     :oauth_key: <%= scope['katello::oauth_key'] %>
     :oauth_secret: <%= scope['katello::oauth_secret'] %>
+    :ca_cert_file: <%= scope['katello::candlepin_ca_cert'] %>
 
   :pulp:
     :url: <%= scope['katello::pulp_url'] %>