openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "HAProxy: Refactor certificate retrieval bits"

This commit is contained in:
Jenkins 2017-03-15 13:54:46 +00:00 committed by Gerrit Code Review
parent 43fa49ebf8 bee651abcb
commit 0136098cc2
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/certmonger/haproxy.pp
View File

@ -52,14 +52,27 @@ define tripleo::certmonger::haproxy (
$certmonger_ca = hiera('certmonger_ca', 'local'),
$principal = undef,
){
include ::certmonger
include ::haproxy::params
# This is only needed for certmonger's local CA. For any other CA this
# operation (trusting the CA) should be done by the deployer.
if $certmonger_ca == 'local' {
class { '::tripleo::certmonger::ca::local':
notify => Class['::tripleo::haproxy']
}
}
certmonger_certificate { "${title}-cert":
ensure => 'present',
ca => $certmonger_ca,
hostname => $hostname,
dnsname => $hostname,
certfile => $service_certificate,
keyfile => $service_key,
postsave_cmd => $postsave_cmd,
principal => $principal,
wait => true,
require => Class['::certmonger'],
}
concat { $service_pem :
ensure => present,

22
manifests/profile/base/haproxy.pp
View File

@ -32,10 +32,6 @@
# principal: "haproxy/<undercloud fqdn>"
# Defaults to {}.
#
# [*certmonger_ca*]
# (Optional) The CA that certmonger will use to generate the certificates.
# Defaults to hiera('certmonger_ca', 'local').
#
# [*enable_load_balancer*]
# (Optional) Whether or not loadbalancer is enabled.
# Defaults to hiera('enable_load_balancer', true).
@ -55,7 +51,6 @@
#
class tripleo::profile::base::haproxy (
$certificates_specs = {},
$certmonger_ca = hiera('certmonger_ca', 'local'),
$enable_load_balancer = hiera('enable_load_balancer', true),
$generate_service_certificates = hiera('generate_service_certificates', false),
$step = hiera('step'),
@ -63,22 +58,7 @@ class tripleo::profile::base::haproxy (
if $step >= 1 {
if $enable_load_balancer {
if str2bool($generate_service_certificates) {
include ::certmonger
# This is only needed for certmonger's local CA. For any other CA this
# operation (trusting the CA) should be done by the deployer.
if $certmonger_ca == 'local' {
class { '::tripleo::certmonger::ca::local':
notify => Class['::tripleo::haproxy']
}
}
Certmonger_certificate {
ca => $certmonger_ca,
ensure => 'present',
wait => true,
require => Class['::certmonger'],
}
create_resources('::tripleo::certmonger::haproxy', $certificates_specs)
ensure_resources('tripleo::certmonger::haproxy', $certificates_specs)
# The haproxy fronends (or listen resources) depend on the certificate
# existing and need to be refreshed if it changed.
Tripleo::Certmonger::Haproxy<||> ~> Haproxy::Listen<||>