diff --git a/manifests/init.pp b/manifests/init.pp index 57ef4afb..2d028399 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -118,10 +118,15 @@ hostname => $capsule_fqdn } + class { 'certs::qpid': } ~> class { 'pulp': - default_password => $pulp_admin_password, - oauth_key => $pulp_oauth_key, - oauth_secret => $pulp_oauth_secret + default_password => $pulp_admin_password, + oauth_key => $pulp_oauth_key, + oauth_secret => $pulp_oauth_secret, + qpid_ssl_cert_db => $certs::nss_db_dir, + qpid_ssl_cert_password_file => $certs::qpid::nss_db_password_file, + messaging_ca_cert => $certs::ca_cert, + messaging_client_cert => $certs::params::messaging_client_cert } ~> class { 'pulp::child': parent_fqdn => $parent_fqdn, @@ -134,10 +139,6 @@ hostname => $capsule_fqdn, notify => [ Class['pulp'], Class['pulp::child'] ], } - - katello_node { "https://${parent_fqdn}/katello": - content => $pulp - } } if $puppet {