Fixes #10670 - deploy the katello-default-ca as part of the bootstrap…

… RPM
theforeman · Jun 2, 2015 · a9321de · a9321de
1 parent 41e2157
commit a9321de
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/manifests/katello.pp b/manifests/katello.pp
@@ -39,7 +39,10 @@
     dir              => $katello_www_pub_dir,
     summary          => $candlepin_consumer_summary,
     description      => $candlepin_consumer_description,
-    files            => ["${rhsm_ca_dir}/katello-server-ca.pem:644 =${certs::pki_dir}/certs/${certs::server_ca_name}.crt"],
+    # katello-default-ca is needed for the katello-agent to work properly
+    # (especially in the custom certs scenario)
+    files            => ["${rhsm_ca_dir}/katello-default-ca.pem:644=${certs::pki_dir}/certs/${certs::default_ca_name}.crt",
+                        "${rhsm_ca_dir}/katello-server-ca.pem:644=${certs::pki_dir}/certs/${certs::server_ca_name}.crt"],
     bootstrap_script => template('certs/rhsm-katello-reconfigure.erb'),
     alias            => $candlepin_cert_rpm_alias,
     subscribe        => $::certs::server_ca,