From 8b22025432a0b99f61ddd7d9198a2462cad7b2a8 Mon Sep 17 00:00:00 2001 From: Justin Sherrill Date: Tue, 4 Feb 2014 15:07:03 -0500 Subject: [PATCH] adding cert key and crl to pulp --- manifests/init.pp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 4db2c1bd..52579467 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -42,15 +42,6 @@ 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, @@ -58,6 +49,17 @@ 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':