openstack/puppet-tripleo
Code Issues Proposed changes

Handle SSL options for Zaqar

Browse Source 
This allows running Zaqar with SSL under Apache.

Change-Id: I4c68a662c2433398249f770ac50ba0791449fe71
This commit is contained in:
Thomas Herve 2017-07-24 13:14:22 +02:00 committed by Alex Schultz
parent 237e613a17
commit 01ae503525
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/haproxy.pp
View File

@ -1483,6 +1483,7 @@ class tripleo::haproxy (
mode => 'http', mode => 'http',
public_ssl_port => $ports[zaqar_api_ssl_port], public_ssl_port => $ports[zaqar_api_ssl_port],
service_network => $zaqar_api_network, service_network => $zaqar_api_network,
member_options => union($haproxy_member_options, $internal_tls_member_options),
} }
} }

40
manifests/profile/base/zaqar.pp
View File

@ -30,6 +30,27 @@
# (Optional) The messaging store for Zaqar. # (Optional) The messaging store for Zaqar.
# Defaults to 'mongodb' # Defaults to 'mongodb'
# #
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
# it will create.
# Example with hiera:
# apache_certificates_specs:
# httpd-internal_api:
# hostname: <overcloud controller fqdn>
# service_certificate: <service certificate path>
# service_key: <service key path>
# principal: "haproxy/<overcloud controller fqdn>"
# Defaults to hiera('apache_certificate_specs', {}).
#
# [*enable_internal_tls*]
# (Optional) Whether TLS in the internal network is enabled or not.
# Defaults to hiera('enable_internal_tls', false)
#
# [*zaqar_api_network*]
# (Optional) The network name where the zaqar API endpoint is listening on.
# This is set by t-h-t.
# Defaults to hiera('zaqar_api_network', undef)
#
# [*step*] # [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates # (Optional) The current step in deployment. See tripleo-heat-templates
# for more details. # for more details.
@ -39,6 +60,9 @@ class tripleo::profile::base::zaqar (
$bootstrap_node = hiera('bootstrap_nodeid', undef), $bootstrap_node = hiera('bootstrap_nodeid', undef),
$management_store = 'mongodb', $management_store = 'mongodb',
$messaging_store = 'mongodb', $messaging_store = 'mongodb',
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$zaqar_api_network = hiera('zaqar_api_network', undef),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
) { ) {
if $::hostname == downcase($bootstrap_node) { if $::hostname == downcase($bootstrap_node) {
@ -47,6 +71,17 @@ class tripleo::profile::base::zaqar (
$is_bootstrap = false $is_bootstrap = false
} }
if $enable_internal_tls {
if !$zaqar_api_network {
fail('zaqar_api_network is not set in the hieradata.')
}
$tls_certfile = $certificates_specs["httpd-${zaqar_api_network}"]['service_certificate']
$tls_keyfile = $certificates_specs["httpd-${zaqar_api_network}"]['service_key']
} else {
$tls_certfile = undef
$tls_keyfile = undef
}
if $step >= 4 or ( $step >= 3 and $is_bootstrap ) { if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
include ::zaqar include ::zaqar
@ -92,7 +127,10 @@ class tripleo::profile::base::zaqar (
class { '::zaqar::server': class { '::zaqar::server':
service_name => 'httpd', # TODO cleanup when passed by t-h-t. service_name => 'httpd', # TODO cleanup when passed by t-h-t.
} }
include ::zaqar::wsgi::apache class { '::zaqar::wsgi::apache':
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,
}
zaqar::server_instance{ '1': zaqar::server_instance{ '1':
transport => 'websocket' transport => 'websocket'
} }