openstack/puppet-tripleo
Code Issues Proposed changes

Better support for redis in Zaqar

Browse Source 
Align with other services and reuse the redis_vip hiera data instead of
passing the URI. It also addes the zaqar_redis_password hiera.

Change-Id: Ic73935b9b1740a254c81d7e692b7787563716684
This commit is contained in:
Thomas Herve 2017-09-21 10:51:44 +02:00
parent 9939df4c17
commit 82668fd618
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,19 +51,29 @@
# This is set by t-h-t. # This is set by t-h-t.
# Defaults to hiera('zaqar_api_network', undef) # Defaults to hiera('zaqar_api_network', undef)
# #
# [*zaqar_redis_password*]
# (Optional) Password for the gnocchi redis user for the coordination url
# Defaults to hiera('zaqar_redis_password')
#
# [*redis_vip*]
# (Optional) Redis ip address for the coordination url
# Defaults to hiera('redis_vip')
#
# [*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.
# Defaults to hiera('step') # Defaults to hiera('step')
# #
class tripleo::profile::base::zaqar ( 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', {}), $certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false), $enable_internal_tls = hiera('enable_internal_tls', false),
$zaqar_api_network = hiera('zaqar_api_network', undef), $zaqar_api_network = hiera('zaqar_api_network', undef),
$step = Integer(hiera('step')), $zaqar_redis_password = hiera('zaqar_redis_password', undef),
$redis_vip = hiera('redis_vip', undef),
$step = Integer(hiera('step')),
) { ) {
if $::hostname == downcase($bootstrap_node) { if $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true $is_bootstrap = true
@ -77,9 +87,11 @@ class tripleo::profile::base::zaqar (
} }
$tls_certfile = $certificates_specs["httpd-${zaqar_api_network}"]['service_certificate'] $tls_certfile = $certificates_specs["httpd-${zaqar_api_network}"]['service_certificate']
$tls_keyfile = $certificates_specs["httpd-${zaqar_api_network}"]['service_key'] $tls_keyfile = $certificates_specs["httpd-${zaqar_api_network}"]['service_key']
$tls_query_param = '?ssl=true'
} else { } else {
$tls_certfile = undef $tls_certfile = undef
$tls_keyfile = undef $tls_keyfile = undef
$tls_query_param = ''
} }
if $step >= 4 or ( $step >= 3 and $is_bootstrap ) { if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
@ -105,7 +117,9 @@ class tripleo::profile::base::zaqar (
uri => $mongo_database_connection, uri => $mongo_database_connection,
} }
} elsif $messaging_store == 'redis' { } elsif $messaging_store == 'redis' {
include ::zaqar::messaging::redis class {'::zaqar::messaging::redis':
uri => join(['redis://:', $zaqar_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param]),
}
} else { } else {
fail("unsupported Zaqar messaging_store set: ${messaging_store}") fail("unsupported Zaqar messaging_store set: ${messaging_store}")
} }