Rely on the generated CA certificate

Author: ehelms

manifests/init.pp

@@ -310,9 +310,9 @@
     rhsm_hostname   => $client_facing_servername,
     rhsm_port       => $rhsm_port,
     rhsm_path       => $rhsm_path,
-    server_ca_cert  => $certs::katello_server_ca_cert,
+    server_ca_cert  => $certs::ca::server_ca_path,
     server_ca_name  => $certs::server_ca_name,
-    default_ca_cert => $certs::katello_default_ca_cert,
+    default_ca_cert => $certs::ca::default_ca_path,
     default_ca_name => $certs::default_ca_name,
   }
 

spec/acceptance/bootstrap_rpm_spec.rb

@@ -13,9 +13,9 @@
         include certs
 
         class { 'foreman_proxy_content::bootstrap_rpm':
-          server_ca_cert  => $certs::katello_server_ca_cert,
+          server_ca_cert  => $certs::ca::server_ca_path,
           server_ca_name  => $certs::server_ca_name,
-          default_ca_cert => $certs::katello_default_ca_cert,
+          default_ca_cert => $certs::ca::default_ca_path,
           default_ca_name => $certs::default_ca_name,
         }
 
@@ -100,9 +100,9 @@ class { 'foreman_proxy_content::bootstrap_rpm':
         include certs
 
         class { 'foreman_proxy_content::bootstrap_rpm':
-          server_ca_cert  => $certs::katello_server_ca_cert,
+          server_ca_cert  => $certs::ca::server_ca_path,
           server_ca_name  => $certs::server_ca_name,
-          default_ca_cert => $certs::katello_default_ca_cert,
+          default_ca_cert => $certs::ca::default_ca_path,
           default_ca_name => $certs::default_ca_name,
         }
       PUPPET
@@ -145,9 +145,9 @@ class { 'foreman_proxy_content::bootstrap_rpm':
         include certs
 
         class { 'foreman_proxy_content::bootstrap_rpm':
-          server_ca_cert  => $certs::katello_server_ca_cert,
+          server_ca_cert  => $certs::ca::server_ca_path,
           server_ca_name  => $certs::server_ca_name,
-          default_ca_cert => $certs::katello_default_ca_cert,
+          default_ca_cert => $certs::ca::default_ca_path,
           default_ca_name => $certs::default_ca_name,
         }
 
@@ -185,9 +185,9 @@ class { 'foreman_proxy_content::bootstrap_rpm':
 
         class { 'foreman_proxy_content::bootstrap_rpm':
           rhsm_port       => 8443,
-          server_ca_cert  => $certs::katello_server_ca_cert,
+          server_ca_cert  => $certs::ca::server_ca_path,
           server_ca_name  => $certs::server_ca_name,
-          default_ca_cert => $certs::katello_default_ca_cert,
+          default_ca_cert => $certs::ca::default_ca_path,
           default_ca_name => $certs::default_ca_name,
         }
 
@@ -239,9 +239,9 @@ class { 'foreman_proxy_content::bootstrap_rpm':
 
           class { 'foreman_proxy_content::bootstrap_rpm':
             rhsm_port       => 844#{num},
-            server_ca_cert  => $certs::katello_server_ca_cert,
+            server_ca_cert  => $certs::ca::server_ca_path,
             server_ca_name  => $certs::server_ca_name,
-            default_ca_cert => $certs::katello_default_ca_cert,
+            default_ca_cert => $certs::ca::default_ca_path,
             default_ca_name => $certs::default_ca_name,
           }
         PUPPET
@@ -275,9 +275,9 @@ class { 'foreman_proxy_content::bootstrap_rpm':
           include certs
 
           class { 'foreman_proxy_content::bootstrap_rpm':
-            server_ca_cert  => $certs::katello_server_ca_cert,
+            server_ca_cert  => $certs::ca::server_ca_path,
             server_ca_name  => $certs::server_ca_name,
-            default_ca_cert => $certs::katello_default_ca_cert,
+            default_ca_cert => $certs::ca::default_ca_path,
             default_ca_name => $certs::default_ca_name,
           }
         PUPPET
@@ -299,9 +299,9 @@ class { 'foreman_proxy_content::bootstrap_rpm':
 
         class { 'foreman_proxy_content::bootstrap_rpm':
           rhsm_port       => 8447,
-          server_ca_cert  => $certs::katello_server_ca_cert,
+          server_ca_cert  => $certs::ca::server_ca_path,
           server_ca_name  => $certs::server_ca_name,
-          default_ca_cert => $certs::katello_default_ca_cert,
+          default_ca_cert => $certs::ca::default_ca_path,
           default_ca_name => $certs::default_ca_name,
         }
       PUPPET