Skip to content

Commit

Permalink
Fixes #14188 - change pulp_parent to qpid_client class
Browse files Browse the repository at this point in the history
  • Loading branch information
John Mitsch committed Mar 14, 2016
1 parent a440de3 commit 3f87524
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 140 deletions.
2 changes: 0 additions & 2 deletions manifests/capsule.pp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
class { '::certs::apache': hostname => $capsule_fqdn }
class { '::certs::qpid': hostname => $capsule_fqdn }
class { '::certs::qpid_router': hostname => $capsule_fqdn }
class { '::certs::pulp_child': hostname => $capsule_fqdn }

if $certs_tar {
certs::tar_create { $certs_tar:
Expand All @@ -36,7 +35,6 @@
Class['certs::qpid'],
Class['certs::qpid_router'],
Class['certs::apache'],
Class['certs::pulp_child']],
}
}
}
60 changes: 0 additions & 60 deletions manifests/pulp_child.pp

This file was deleted.

78 changes: 0 additions & 78 deletions manifests/pulp_parent.pp

This file was deleted.

44 changes: 44 additions & 0 deletions manifests/qpid_client.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Pulp Master Certs configuration
class certs::qpid_client (

$hostname = $::certs::node_fqdn,
$generate = $::certs::generate,
$regenerate = $::certs::regenerate,
$deploy = $::certs::deploy,

$messaging_client_cert = $certs::params::messaging_client_cert

) {

cert { "${hostname}-qpid-client-cert":
hostname => $hostname,
common_name => 'pulp-qpid-client-cert',
purpose => client,
country => $::certs::country,
state => $::certs::state,
city => $::certs::city,
org => 'PULP',
org_unit => $::certs::org_unit,
expiration => $::certs::expiration,
ca => $::certs::default_ca,
generate => $generate,
regenerate => $regenerate,
deploy => $deploy,
password_file => $certs::ca_key_password_file,
}

if $deploy {

Cert["${hostname}-qpid-client-cert"] ~>
key_bundle { $messaging_client_cert:
key_pair => Cert["${hostname}-qpid-client-cert"],
} ~>
file { $messaging_client_cert:
owner => 'apache',
group => 'apache',
mode => '0640',
}

}

}

0 comments on commit 3f87524

Please sign in to comment.