openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Switch to rabbitmq fqdn hostnames and pass proper CA info"

Browse Source
This commit is contained in:
Zuul 2021-10-11 19:08:12 +00:00 committed by Gerrit Code Review
commit ec8955c26a
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
deployment/rabbitmq/rabbitmq-container-puppet.yaml
View File

@ -101,6 +101,11 @@ parameters:
default: ''
description: Override the private key size used when creating the
certificate for this service
InternalTLSCAFile:
default: '/etc/ipa/ca.crt'
type: string
description: Specifies the default CA cert to use if TLS is used for
services in the internal network.
RabbitmqEnableManagementAccess:
type: boolean
default: false
@ -166,7 +171,13 @@ outputs:
LC_ALL: 'en_US.UTF-8'
NODE_PORT: ''
NODE_IP_ADDRESS: ''
RABBITMQ_NODENAME: "rabbit@%{::hostname}"
RABBITMQ_NODENAME:
str_replace:
template:
"rabbit@%{hiera('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, RabbitmqNetwork]}
RABBITMQ_USE_LONGNAME: 'true'
RABBITMQ_CTL_DIST_PORT_MIN: '25673'
RABBITMQ_CTL_DIST_PORT_MAX: '25683'
'export ERL_EPMD_ADDRESS': "%{hiera('rabbitmq::interface')}"
@ -199,6 +210,8 @@ outputs:
rabbitmq::ssl_port: 5672
rabbitmq::ssl_depth: 1
rabbitmq::ssl_only: {get_param: EnableInternalTLS}
rabbitmq::ssl_cacert: {get_param: InternalTLSCAFile}
rabbitmq::ssl_management_cacert: {get_param: InternalTLSCAFile}
rabbitmq::ssl_interface:
str_replace:
template: