Merge pull request Katello#8 from jlsherrill/cert_easy

DO NOT MERGE adding cert key, ca, and crl to pulp
iNecas · Feb 12, 2014 · 43cf140 · 43cf140
2 parents 8fa95f4 + 8b22025
commit 43cf140
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -42,22 +42,24 @@
 
   class { 'certs::qpid': } ~>
   class { '::certs::pulp_parent': } ~>
-  class { 'pulp':
-    oauth_key                   => $katello::oauth_key,
-    oauth_secret                => $katello::oauth_secret,
-    messaging_url               => 'ssl://localhost:5671',
-    qpid_ssl_cert_db            => '/etc/pki/katello/nssdb',
-    qpid_ssl_cert_password_file => '/etc/katello/nss_db_password-file',
-    before                      => Exec['foreman-rake-db:seed']
-  }
-
   class { 'candlepin':
     user_groups       => $katello::user_groups,
     oauth_key         => $katello::oauth_key,
     oauth_secret      => $katello::oauth_secret,
     deployment_url    => 'katello',
     keystore_password => $::certs::candlepin_keystore_password,
     before            => Exec['foreman-rake-db:seed']
+  } ~>
+  class { 'pulp':
+    oauth_key                   => $katello::oauth_key,
+    oauth_secret                => $katello::oauth_secret,
+    messaging_url               => 'ssl://localhost:5671',
+    before                      => Exec['foreman-rake-db:seed'],
+    qpid_ssl_cert_db            => '/etc/pki/katello/nssdb',
+    qpid_ssl_cert_password_file => '/etc/katello/nss_db_password-file',
+    consumers_ca_cert           => $certs::candlepin::ca_cert,
+    consumers_ca_key            =>  $certs::candlepin::ca_key,
+    consumers_crl               => $candlepin::crl_file
   }
 
   class{ 'elasticsearch':