From 4dacea9c58c287e6d4edd36bf311e3c8d9c21d12 Mon Sep 17 00:00:00 2001 From: "Eric D. Helms" Date: Wed, 21 Nov 2018 14:30:32 -0500 Subject: [PATCH] Update qpid client certificate --- .fixtures.yml | 3 ++- manifests/pulp.pp | 4 ++-- spec/classes/katello_pulp_spec.rb | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 5b72fa8d..ff2ccf9d 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -13,7 +13,8 @@ fixtures: postgresql: "https://github.com/puppetlabs/puppetlabs-postgresql.git" pulp: "https://github.com/theforeman/puppet-pulp.git" qpid: "https://github.com/theforeman/puppet-qpid.git" - squid3: "https://github.com/theforeman/puppet-squid3.git" + squid: "https://github.com/voxpupuli/puppet-squid.git" + selinux: "https://github.com/voxpupuli/puppet-selinux.git" stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git" systemd: "https://github.com/camptocamp/puppet-systemd.git" yumrepo_core: diff --git a/manifests/pulp.pp b/manifests/pulp.pp index 83e89cab..83482d40 100644 --- a/manifests/pulp.pp +++ b/manifests/pulp.pp @@ -40,8 +40,8 @@ class { 'pulp': messaging_url => $messaging_url, - messaging_ca_cert => $certs::ca_cert, - messaging_client_cert => $certs::qpid_client::messaging_client_cert, + messaging_ca_cert => $certs::qpid_client::qpid_client_ca_cert, + messaging_client_cert => $certs::qpid_client::qpid_client_cert, messaging_transport => 'qpid', messaging_auth_enabled => false, broker_url => $broker_url, diff --git a/spec/classes/katello_pulp_spec.rb b/spec/classes/katello_pulp_spec.rb index 81c73e57..5cacc5fe 100644 --- a/spec/classes/katello_pulp_spec.rb +++ b/spec/classes/katello_pulp_spec.rb @@ -23,8 +23,8 @@ class { '::katello': it do is_expected.to create_class('pulp') .with_messaging_url('ssl://localhost:5671') - .with_messaging_ca_cert('/etc/pki/katello/certs/katello-default-ca.crt') - .with_messaging_client_cert('/etc/pki/katello/qpid_client_striped.crt') + .with_messaging_ca_cert('/etc/pki/pulp/qpid/ca.crt') + .with_messaging_client_cert('/etc/pki/pulp/qpid/client.crt') .with_messaging_transport('qpid') .with_messaging_auth_enabled(false) .with_broker_url('qpid://localhost:5671')