Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refs #31878 - Split qpid router server and client certificates #316

Merged
merged 1 commit into from
Feb 19, 2021
Merged

Refs #31878 - Split qpid router server and client certificates #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions manifests/foreman_proxy_content.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,16 @@
fail('The hostname is the same as the provided hostname for the foreman-proxy')
}

class { 'certs::puppet': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::foreman': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::foreman_proxy': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::apache': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::qpid': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::qpid_router': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::qpid_client': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::puppet': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::foreman': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::foreman_proxy': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::apache': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::qpid': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::qpid_router::server': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::qpid_router::client': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }
class { 'certs::qpid_client': hostname => $foreman_proxy_fqdn, cname => $foreman_proxy_cname }

certs::tar_create { $certs_tar:
subscribe => Class['certs::puppet', 'certs::foreman', 'certs::foreman_proxy', 'certs::qpid', 'certs::qpid_router', 'certs::apache', 'certs::qpid_client'],
subscribe => Class['certs::puppet', 'certs::foreman', 'certs::foreman_proxy', 'certs::qpid', 'certs::qpid_router::server', 'certs::qpid_router::client', 'certs::apache', 'certs::qpid_client'],
}
}
45 changes: 5 additions & 40 deletions manifests/qpid_router.pp → manifests/qpid_router/client.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
# Constains certs specific configurations for qpid dispatch router
class certs::qpid_router (
class certs::qpid_router::client (
$hostname = $certs::node_fqdn,
$cname = $certs::cname,
$generate = $certs::generate,
$regenerate = $certs::regenerate,
$deploy = $certs::deploy,
$server_cert = $certs::qpid_router_server_cert,
$client_cert = $certs::qpid_router_client_cert,
$server_key = $certs::qpid_router_server_key,
$client_key = $certs::qpid_router_client_key,
$cert = $certs::qpid_router_client_cert,
$key = $certs::qpid_router_client_key,
$owner = 'qdrouterd',
$group = 'root',

Expand All @@ -21,27 +19,8 @@
$ca_key_password_file = $certs::ca_key_password_file,
) inherits certs {

$server_keypair = "${hostname}-qpid-router-server"
$client_keypair = "${hostname}-qpid-router-client"

cert { $server_keypair:
ensure => present,
hostname => $hostname,
cname => $cname,
country => $country,
state => $state,
city => $city,
org => 'dispatch server',
org_unit => $org_unit,
expiration => $expiration,
ca => $default_ca,
generate => $generate,
regenerate => $regenerate,
deploy => $deploy,
purpose => 'server',
password_file => $ca_key_password_file,
}

cert { $client_keypair:
ensure => present,
hostname => $hostname,
Expand All @@ -61,28 +40,14 @@
}

if $deploy {
certs::keypair { 'qpid_router_server':
key_pair => Cert[$server_keypair],
key_file => $server_key,
manage_key => true,
key_owner => $owner,
key_group => $group,
key_mode => '0640',
cert_file => $server_cert,
manage_cert => true,
cert_owner => $owner,
cert_group => $group,
cert_mode => '0640',
}

certs::keypair { 'qpid_router_client':
key_pair => Cert[$client_keypair],
key_file => $client_key,
key_file => $key,
manage_key => true,
key_owner => $owner,
key_group => $group,
key_mode => '0640',
cert_file => $client_cert,
cert_file => $cert,
manage_cert => true,
cert_owner => $owner,
cert_group => $group,
Expand Down
57 changes: 57 additions & 0 deletions manifests/qpid_router/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# Constains certs specific configurations for qpid dispatch router
class certs::qpid_router::server (
$hostname = $certs::node_fqdn,
$cname = $certs::cname,
$generate = $certs::generate,
$regenerate = $certs::regenerate,
$deploy = $certs::deploy,
$cert = $certs::qpid_router_server_cert,
$key = $certs::qpid_router_server_key,
$owner = 'qdrouterd',
$group = 'root',

$country = $certs::country,
$state = $certs::state,
$city = $certs::city,
$org_unit = $certs::org_unit,
$expiration = $certs::expiration,
$default_ca = $certs::default_ca,
$ca_key_password_file = $certs::ca_key_password_file,
) inherits certs {

$server_keypair = "${hostname}-qpid-router-server"

cert { $server_keypair:
ensure => present,
hostname => $hostname,
cname => $cname,
country => $country,
state => $state,
city => $city,
org => 'dispatch server',
org_unit => $org_unit,
expiration => $expiration,
ca => $default_ca,
generate => $generate,
regenerate => $regenerate,
deploy => $deploy,
purpose => 'server',
password_file => $ca_key_password_file,
}

if $deploy {
certs::keypair { 'qpid_dispatch_server':
key_pair => Cert[$server_keypair],
key_file => $key,
manage_key => true,
key_owner => $owner,
key_group => $group,
key_mode => '0640',
cert_file => $cert,
manage_cert => true,
cert_owner => $owner,
cert_group => $group,
cert_mode => '0640',
}
}
}
13 changes: 13 additions & 0 deletions spec/classes/certs_qpid_router_client_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
require 'spec_helper'

describe 'certs::qpid_router::client' do
on_supported_os.each do |os, os_facts|
let :facts do
os_facts
end

describe 'with default parameters' do
it { should compile.with_all_deps }
end
end
end
13 changes: 13 additions & 0 deletions spec/classes/certs_qpid_router_server_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
require 'spec_helper'

describe 'certs::qpid_router::server' do
on_supported_os.each do |os, os_facts|
let :facts do
os_facts
end

describe 'with default parameters' do
it { should compile.with_all_deps }
end
end
end
15 changes: 0 additions & 15 deletions spec/classes/certs_qpid_router_spec.rb
View file
Open in desktop

This file was deleted.