openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Support both rabbitmq and oslo.messaging service nodes"

Browse Source
This commit is contained in:
Zuul 2018-04-07 00:39:46 +00:00 committed by Gerrit Code Review
commit 408db62e22
24 changed files with 318 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/profile/base/aodh.pp
View File

@ -27,13 +27,17 @@
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -53,7 +57,7 @@
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_notify_node_names', undef)
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
@ -74,13 +78,14 @@
class tripleo::profile::base::aodh (
$step = Integer(hiera('step')),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('aodh::rabbit_password'),
$oslomsg_rpc_port = hiera('aodh::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('aodh::rabbit_userid', 'guest'),
$oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_notify_hosts = hiera('oslo_messaging_notify_node_names', undef),
$oslomsg_notify_password = hiera('aodh::rabbit_password'),
$oslomsg_notify_port = hiera('aodh::rabbit_port', '5672'),
$oslomsg_notify_username = hiera('aodh::rabbit_userid', 'guest'),
@ -95,10 +100,12 @@ class tripleo::profile::base::aodh (
if $step >= 4 or ($step >= 3 and $sync_db) {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts,[]))
$oslomsg_notify_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_notify_hosts,[]))
class { '::aodh' :
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => $oslomsg_rpc_port,
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,
@ -106,7 +113,7 @@ class tripleo::profile::base::aodh (
}),
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,
'hosts' => $oslomsg_notify_hosts_real,
'port' => $oslomsg_notify_port,
'username' => $oslomsg_notify_username,
'password' => $oslomsg_notify_password,

47
manifests/profile/base/barbican/api.pp
View File

@ -48,13 +48,17 @@
# for more details.
# Defaults to hiera('step')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -74,7 +78,7 @@
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_notify_node_names', undef)
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
@ -93,22 +97,23 @@
# Defaults to hiera('barbican::api::rabbit_use_ssl', '0')
class tripleo::profile::base::barbican::api (
$barbican_network = hiera('barbican_api_network', undef),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$step = Integer(hiera('step')),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_password = hiera('barbican::api::rabbit_password'),
$oslomsg_rpc_port = hiera('barbican::api::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('barbican::api::rabbit_userid', 'guest'),
$oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_notify_password = hiera('barbican::api::rabbit_password'),
$oslomsg_notify_port = hiera('barbican::api::rabbit_port', '5672'),
$oslomsg_notify_username = hiera('barbican::api::rabbit_userid', 'guest'),
$oslomsg_use_ssl = hiera('barbican::api::rabbit_use_ssl', '0'),
$barbican_network = hiera('barbican_api_network', undef),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$step = Integer(hiera('step')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('barbican::api::rabbit_password'),
$oslomsg_rpc_port = hiera('barbican::api::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('barbican::api::rabbit_userid', 'guest'),
$oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
$oslomsg_notify_hosts = hiera('oslo_messaging_notify_node_names', undef),
$oslomsg_notify_password = hiera('barbican::api::rabbit_password'),
$oslomsg_notify_port = hiera('barbican::api::rabbit_port', '5672'),
$oslomsg_notify_username = hiera('barbican::api::rabbit_userid', 'guest'),
$oslomsg_use_ssl = hiera('barbican::api::rabbit_use_ssl', '0'),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
@ -133,11 +138,13 @@ class tripleo::profile::base::barbican::api (
include ::tripleo::profile::base::barbican::backends
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
$oslomsg_notify_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_notify_hosts, []))
class { '::barbican::api':
sync_db => $sync_db,
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => $oslomsg_rpc_port,
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,
@ -145,7 +152,7 @@ class tripleo::profile::base::barbican::api (
}),
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,
'hosts' => $oslomsg_notify_hosts_real,
'port' => $oslomsg_notify_port,
'username' => $oslomsg_notify_username,
'password' => $oslomsg_notify_password,

19
manifests/profile/base/ceilometer.pp
View File

@ -23,13 +23,17 @@
# for more details.
# Defaults to hiera('step')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -49,7 +53,7 @@
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_notify_node_names', undef)
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
@ -69,13 +73,14 @@
class tripleo::profile::base::ceilometer (
$step = Integer(hiera('step')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('ceilometer::rabbit_password'),
$oslomsg_rpc_port = hiera('ceilometer::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('ceilometer::rabbit_userid', 'guest'),
$oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_notify_hosts = hiera('oslo_messaging_notify_node_names', undef),
$oslomsg_notify_password = hiera('ceilometer::rabbit_password'),
$oslomsg_notify_port = hiera('ceilometer::rabbit_port', '5672'),
$oslomsg_notify_username = hiera('ceilometer::rabbit_userid', 'guest'),
@ -84,10 +89,12 @@ class tripleo::profile::base::ceilometer (
if $step >= 3 {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
$oslomsg_notify_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_notify_hosts, []))
class { '::ceilometer' :
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => $oslomsg_rpc_port,
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,
@ -95,7 +102,7 @@ class tripleo::profile::base::ceilometer (
}),
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,
'hosts' => $oslomsg_notify_hosts_real,
'port' => $oslomsg_notify_port,
'username' => $oslomsg_notify_username,
'password' => $oslomsg_notify_password,

19
manifests/profile/base/cinder.pp
View File

@ -30,13 +30,17 @@
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -56,7 +60,7 @@
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_notify_node_names', undef)
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
@ -78,13 +82,14 @@ class tripleo::profile::base::cinder (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$cinder_enable_db_purge = true,
$step = Integer(hiera('step')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('cinder::rabbit_password'),
$oslomsg_rpc_port = hiera('cinder::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('cinder::rabbit_userid', 'guest'),
$oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_notify_hosts = hiera('oslo_messaging_notify_node_names', undef),
$oslomsg_notify_password = hiera('cinder::rabbit_password'),
$oslomsg_notify_port = hiera('cinder::rabbit_port', '5672'),
$oslomsg_notify_username = hiera('cinder::rabbit_userid', 'guest'),
@ -98,10 +103,12 @@ class tripleo::profile::base::cinder (
if $step >= 4 or ($step >= 3 and $sync_db) {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
$oslomsg_notify_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_notify_hosts, []))
class { '::cinder' :
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => $oslomsg_rpc_port,
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,
@ -111,7 +118,7 @@ class tripleo::profile::base::cinder (
class { '::cinder::ceilometer' :
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,
'hosts' => $oslomsg_notify_hosts_real,
'port' => $oslomsg_notify_port,
'username' => $oslomsg_notify_username,
'password' => $oslomsg_notify_password,

12
manifests/profile/base/congress.pp
View File

@ -26,13 +26,17 @@
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -53,8 +57,9 @@
class tripleo::profile::base::congress (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = Integer(hiera('step')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('congress::rabbit_password'),
$oslomsg_rpc_port = hiera('congress::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('congress::rabbit_userid', 'guest'),
@ -68,11 +73,12 @@ class tripleo::profile::base::congress (
if $step >= 4 or ($step >= 3 and $sync_db){
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
class { '::congress':
sync_db => $sync_db,
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => sprintf('%s', $oslomsg_rpc_port),
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,

12
manifests/profile/base/glance/api.pp
View File

@ -57,8 +57,12 @@
# Defaults to hiera('step')
#
# [*rabbit_hosts*]
# list of the rabbbit host fqdns
# Defaults to hiera('rabbitmq_node_names')
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*rabbit_port*]
# IP port for rabbitmq service
@ -91,6 +95,7 @@ class tripleo::profile::base::glance::api (
$glance_nfs_enabled = false,
$step = Integer(hiera('step')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$rabbit_port = hiera('glance::notify::rabbitmq::rabbit_port', 5672),
$tls_proxy_bind_ip = undef,
$tls_proxy_fqdn = undef,
@ -156,7 +161,8 @@ class tripleo::profile::base::glance::api (
stores => $glance_store,
sync_db => $sync_db,
}
$rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
$oslomsg_rpc_hosts_real = pick($rabbit_hosts, $oslomsg_rpc_hosts, [])
$rabbit_endpoints = suffix(any2array($oslomsg_rpc_hosts_real), ":${rabbit_port}")
class { '::glance::notify::rabbitmq' :
rabbit_hosts => $rabbit_endpoints,
}

20
manifests/profile/base/heat.pp
View File

@ -35,13 +35,17 @@
# for more details.
# Defaults to hiera('step')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -61,7 +65,7 @@
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_notify_node_names', undef)
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
@ -84,13 +88,14 @@ class tripleo::profile::base::heat (
$manage_db_purge = hiera('heat_enable_db_purge', true),
$notification_driver = 'messaging',
$step = Integer(hiera('step')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('heat::rabbit_password'),
$oslomsg_rpc_port = hiera('heat::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('heat::rabbit_userid', 'guest'),
$oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_notify_hosts = hiera('oslo_messaging_notify_node_names', undef),
$oslomsg_notify_password = hiera('heat::rabbit_password'),
$oslomsg_notify_port = hiera('heat::rabbit_port', '5672'),
$oslomsg_notify_username = hiera('heat::rabbit_userid', 'guest'),
@ -106,12 +111,13 @@ class tripleo::profile::base::heat (
}
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
$oslomsg_notify_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_notify_hosts, []))
class { '::heat' :
notification_driver => $notification_driver,
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => $oslomsg_rpc_port,
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,
@ -119,7 +125,7 @@ class tripleo::profile::base::heat (
}),
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,
'hosts' => $oslomsg_notify_hosts_real,
'port' => $oslomsg_notify_port,
'username' => $oslomsg_notify_username,
'password' => $oslomsg_notify_password,

12
manifests/profile/base/ironic.pp
View File

@ -26,13 +26,17 @@
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -53,8 +57,9 @@
class tripleo::profile::base::ironic (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = Integer(hiera('step')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('ironic::rabbit_password'),
$oslomsg_rpc_port = hiera('ironic::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('ironic::rabbit_userid', 'guest'),
@ -69,12 +74,13 @@ class tripleo::profile::base::ironic (
if $step >= 4 or ($step >= 3 and $sync_db) {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
class { '::ironic':
sync_db => $sync_db,
db_online_data_migrations => $sync_db,
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => sprintf('%s', $oslomsg_rpc_port),
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,

19
manifests/profile/base/keystone.pp
View File

@ -77,13 +77,17 @@
# This is set by t-h-t.
# Defaults to hiera('keystone_public_api_network', undef)
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -103,7 +107,7 @@
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_notify_node_names', undef)
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
@ -155,13 +159,14 @@ class tripleo::profile::base::keystone (
$ldap_backend_enable = false,
$manage_db_purge = hiera('keystone_enable_db_purge', true),
$public_endpoint_network = hiera('keystone_public_api_network', undef),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('keystone::rabbit_password'),
$oslomsg_rpc_port = hiera('keystone::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('keystone::rabbit_userid', 'guest'),
$oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_notify_hosts = hiera('oslo_messaging_notify_node_names', undef),
$oslomsg_notify_password = hiera('keystone::rabbit_password'),
$oslomsg_notify_port = hiera('keystone::rabbit_port', '5672'),
$oslomsg_notify_username = hiera('keystone::rabbit_userid', 'guest'),
@ -205,12 +210,14 @@ class tripleo::profile::base::keystone (
if $step >= 4 or ( $step >= 3 and $sync_db ) {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
$oslomsg_notify_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_notify_hosts, []))
class { '::keystone':
sync_db => $sync_db,
enable_bootstrap => $sync_db,
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => $oslomsg_rpc_port,
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,
@ -218,7 +225,7 @@ class tripleo::profile::base::keystone (
}),
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,
'hosts' => $oslomsg_notify_hosts_real,
'port' => $oslomsg_notify_port,
'username' => $oslomsg_notify_username,
'password' => $oslomsg_notify_password,

19
manifests/profile/base/manila.pp
View File

@ -26,13 +26,17 @@
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -52,7 +56,7 @@
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_notify_node_names', undef)
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
@ -73,13 +77,14 @@
class tripleo::profile::base::manila (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = Integer(hiera('step')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('manila::rabbit_password'),
$oslomsg_rpc_port = hiera('manila::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('manila::rabbit_userid', 'guest'),
$oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_notify_hosts = hiera('oslo_messaging_notify_node_names', undef),
$oslomsg_notify_password = hiera('manila::rabbit_password'),
$oslomsg_notify_port = hiera('manila::rabbit_port', '5672'),
$oslomsg_notify_username = hiera('manila::rabbit_userid', 'guest'),
@ -93,10 +98,12 @@ class tripleo::profile::base::manila (
if $step >= 4 or ($step >= 3 and $sync_db) {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
$oslomsg_notify_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_notify_hosts, []))
class { '::manila' :
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => $oslomsg_rpc_port,
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,
@ -104,7 +111,7 @@ class tripleo::profile::base::manila (
}),
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,
'hosts' => $oslomsg_notify_hosts_real,
'port' => $oslomsg_notify_port,
'username' => $oslomsg_notify_username,
'password' => $oslomsg_notify_password,

19
manifests/profile/base/mistral.pp
View File

@ -27,13 +27,17 @@
# for more details.
# Defaults to hiera('step')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -53,7 +57,7 @@
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_notify_node_names', undef)
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
@ -74,13 +78,14 @@
class tripleo::profile::base::mistral (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = Integer(hiera('step')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('mistral::rabbit_password'),
$oslomsg_rpc_port = hiera('mistral::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('mistral::rabbit_userid', 'guest'),
$oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_notify_hosts = hiera('oslo_messaging_notify_node_names', undef),
$oslomsg_notify_password = hiera('mistral::rabbit_password'),
$oslomsg_notify_port = hiera('mistral::rabbit_port', '5672'),
$oslomsg_notify_username = hiera('mistral::rabbit_userid', 'guest'),
@ -94,10 +99,12 @@ class tripleo::profile::base::mistral (
if $step >= 4 or ($step >= 3 and $sync_db) {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
$oslomsg_notify_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_notify_hosts, []))
class { '::mistral':
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => $oslomsg_rpc_port,
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,
@ -105,7 +112,7 @@ class tripleo::profile::base::mistral (
}),
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,
'hosts' => $oslomsg_notify_hosts_real,
'port' => $oslomsg_notify_port,
'username' => $oslomsg_notify_username,
'password' => $oslomsg_notify_password,

20
manifests/profile/base/neutron.pp
View File

@ -22,13 +22,17 @@
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -48,7 +52,7 @@
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_notify_node_names', undef)
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
@ -81,13 +85,14 @@
class tripleo::profile::base::neutron (
$step = Integer(hiera('step')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('neutron::rabbit_password'),
$oslomsg_rpc_port = hiera('neutron::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('neutron::rabbit_user', 'guest'),
$oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_notify_hosts = hiera('oslo_messaging_notify_node_names', undef),
$oslomsg_notify_password = hiera('neutron::rabbit_password'),
$oslomsg_notify_port = hiera('neutron::rabbit_port', '5672'),
$oslomsg_notify_username = hiera('neutron::rabbit_user', 'guest'),
@ -97,7 +102,8 @@ class tripleo::profile::base::neutron (
) {
if $step >= 3 {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
$oslomsg_notify_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_notify_hosts, []))
$dhcp_agent_count = size($dhcp_nodes)
if $dhcp_agents_per_network {
$dhcp_agents_per_net = $dhcp_agents_per_network
@ -112,7 +118,7 @@ class tripleo::profile::base::neutron (
class { '::neutron' :
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => $oslomsg_rpc_port,
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,
@ -120,7 +126,7 @@ class tripleo::profile::base::neutron (
}),
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,
'hosts' => $oslomsg_notify_hosts_real,
'port' => $oslomsg_notify_port,
'username' => $oslomsg_notify_username,
'password' => $oslomsg_notify_password,

21
manifests/profile/base/nova.pp
View File

@ -22,13 +22,17 @@
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -48,7 +52,7 @@
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_notify_node_names', undef)
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
@ -76,19 +80,20 @@
class tripleo::profile::base::nova (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('nova::rabbit_password'),
$oslomsg_rpc_port = hiera('nova::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('nova::rabbit_userid', 'guest'),
$oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_notify_hosts = hiera('oslo_messaging_notify_node_names', undef),
$oslomsg_notify_password = hiera('nova::rabbit_password'),
$oslomsg_notify_port = hiera('nova::rabbit_port', '5672'),
$oslomsg_notify_username = hiera('nova::rabbit_userid', 'guest'),
$oslomsg_use_ssl = hiera('nova::rabbit_use_ssl', '0'),
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips'),
) {
if $::hostname == downcase($bootstrap_node) {
@ -105,6 +110,8 @@ class tripleo::profile::base::nova (
if $step >= 4 or ($step >= 3 and $sync_db) {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
$oslomsg_notify_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_notify_hosts, []))
include ::nova::config
class { '::nova::cache':
enabled => true,
@ -114,7 +121,7 @@ class tripleo::profile::base::nova (
class { '::nova':
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => $oslomsg_rpc_port,
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,
@ -122,7 +129,7 @@ class tripleo::profile::base::nova (
}),
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,
'hosts' => $oslomsg_notify_hosts_real,
'port' => $oslomsg_notify_port,
'username' => $oslomsg_notify_username,
'password' => $oslomsg_notify_password,

14
manifests/profile/base/novajoin.pp
View File

@ -25,14 +25,18 @@
# Enable FreeIPA client installation for the node this runs on.
# Defaults to false
#
# [*oslomsg_rpc_hosts*]
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_password*]
# Password for oslo messaging rpc service
# Defaults to undef
@ -57,8 +61,9 @@
class tripleo::profile::base::novajoin (
$service_password,
$enable_ipa_client_install = false,
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = undef,
$oslomsg_rpc_port = '5672',
$oslomsg_rpc_username = 'guest',
@ -67,12 +72,13 @@ class tripleo::profile::base::novajoin (
) {
if $step >= 3 {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts))
class { '::nova::metadata::novajoin::api' :
service_password => $service_password,
enable_ipa_client_install => $enable_ipa_client_install,
transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => sprintf('%s', $oslomsg_rpc_port),
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,

12
manifests/profile/base/octavia.pp
View File

@ -22,13 +22,17 @@
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -48,8 +52,9 @@
class tripleo::profile::base::octavia (
$step = Integer(hiera('step')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('octavia::rabbit_password'),
$oslomsg_rpc_port = hiera('octavia::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('octavia::rabbit_userid', 'guest'),
@ -57,10 +62,11 @@ class tripleo::profile::base::octavia (
) {
if $step >= 3 {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
class { '::octavia' :
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => sprintf('%s', $oslomsg_rpc_port),
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,

18
manifests/profile/base/qdr.pp
View File

@ -31,9 +31,13 @@
# directly because it requires a string and we have a number.
# Defaults to hiera('tripleo::profile::base::qdr::qdr_listener_port', 5672)
#
# [*qdr_node_names*]
# Set of nodes for qdr mesh deployment setup
# Defaults to hiera('rabbitmq_node_names')
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -45,8 +49,10 @@ class tripleo::profile::base::qdr (
$qdr_password = undef,
$qdr_listener_port = hiera('tripleo::profile::base::qdr::qdr_listener_port', 5672),
$step = Integer(hiera('step')),
$qdr_node_names = pick(hiera('qdr_node_names',undef),hiera('rabbitmq_node_names')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
) {
$qdr_node_names = pick($oslomsg_rpc_hosts, $rabbit_hosts, [])
if $step >= 1 {
# For multi-node deployments of the dispatch router, a mesh of
# inter-router links is created. Bi-directional links must
@ -69,7 +75,7 @@ class tripleo::profile::base::qdr (
} else {
$memo + [{'host' => $node,
'role' => 'inter-router',
'port' => '25672'}]
'port' => '31460'}]
}
}
} - true
@ -82,7 +88,7 @@ class tripleo::profile::base::qdr (
$extra_listeners = size($qdr_node_names) ? {
1 => [],
default => [{'host' => '0.0.0.0',
'port' => '25672',
'port' => '31460',
'role' => 'inter-router'}],
}

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

@ -55,9 +55,9 @@
# (Optional) RabbitMQ environment.
# Defaults to hiera('rabbitmq_environment').
#
# [*nodes*]
# [*rabbit_nodes*]
# (Optional) Array of host(s) for RabbitMQ nodes.
# Defaults to hiera('rabbitmq_node_names', []).
# Defaults to hiera('rabbitmq_node_names', undef).
#
# [*rabbitmq_pass*]
# (Optional) RabbitMQ Default Password.
@ -67,6 +67,10 @@
# (Optional) RabbitMQ Default User.
# Defaults to hiera('rabbitmq::default_user')
#
# [*oslomsg_rpc_nodes*]
# (Optional) Array of host(s) for Oslo Messaging rpc nodes.
# Defaults to hiera('oslo_messaging_rpc_node_names', undef).
#
# [*stack_action*]
# (Optional) Action of the stack deployment.
# Defaults to hiera('stack_action')
@ -76,10 +80,14 @@
# for more details.
# Defaults to hiera('step')
#
# [*bootstrap_node*]
# [*rabbit_bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('rabbitmq_short_bootstrap_node_name')
#
# [*oslomsg_rpc_bootstrap_node*]
# (Optional) The hostname of the rpc node responsible for bootstrapping tasks
# Defaults to hiera('oslo_messaging_rpc_short_bootstrap_node_name')
#
class tripleo::profile::base::rabbitmq (
$certificate_specs = {},
$config_variables = hiera('rabbitmq_config_variables'),
@ -88,13 +96,16 @@ class tripleo::profile::base::rabbitmq (
$inet_dist_interface = hiera('rabbitmq::interface', undef),
$ipv6 = str2bool(hiera('rabbit_ipv6', false)),
$kernel_variables = hiera('rabbitmq_kernel_variables'),
$nodes = hiera('rabbitmq_node_names', []),
$rabbit_nodes = hiera('rabbitmq_node_names', undef),
$rabbitmq_pass = hiera('rabbitmq::default_pass'),
$oslomsg_rpc_nodes = hiera('oslo_messaging_rpc_node_names', undef),
$rabbitmq_user = hiera('rabbitmq::default_user'),
$stack_action = hiera('stack_action'),
$step = Integer(hiera('step')),
$bootstrap_node = hiera('rabbitmq_short_bootstrap_node_name'),
$rabbit_bootstrap_node = hiera('rabbitmq_short_bootstrap_node_name', undef),
$oslomsg_rpc_bootstrap_node = hiera('oslo_messaging_rpc_short_bootstrap_node_name', undef),
) {
$bootstrap_node = pick($rabbit_bootstrap_node, $oslomsg_rpc_bootstrap_node, [])
if $enable_internal_tls {
$tls_certfile = $certificate_specs['service_certificate']
$tls_keyfile = $certificate_specs['service_key']
@ -122,6 +133,7 @@ class tripleo::profile::base::rabbitmq (
$real_kernel_variables = $kernel_variables
}
$nodes = pick($rabbit_nodes, $oslomsg_rpc_nodes, [])
$manage_service = hiera('rabbitmq::service_manage', true)
if $step >= 1 {
# Specific configuration for multi-nodes or when running with Pacemaker.

19
manifests/profile/base/sahara.pp
View File

@ -26,13 +26,17 @@
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -52,7 +56,7 @@
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_notify_node_names', undef)
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
@ -73,13 +77,14 @@
class tripleo::profile::base::sahara (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = Integer(hiera('step')),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('sahara::rabbit_password'),
$oslomsg_rpc_port = hiera('sahara::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('sahara::rabbit_userid', 'guest'),
$oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_notify_hosts = hiera('oslo_messaging_notify_node_names', undef),
$oslomsg_notify_password = hiera('sahara::rabbit_password'),
$oslomsg_notify_port = hiera('sahara::rabbit_port', '5672'),
$oslomsg_notify_username = hiera('sahara::rabbit_userid', 'guest'),
@ -93,11 +98,13 @@ class tripleo::profile::base::sahara (
if $step >= 4 or ($step >= 3 and $sync_db){
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
$oslomsg_notify_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_notify_hosts, []))
class { '::sahara':
sync_db => $sync_db,
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => $oslomsg_rpc_port,
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,
@ -107,7 +114,7 @@ class tripleo::profile::base::sahara (
class { '::sahara::notify':
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,
'hosts' => $oslomsg_notify_hosts_real,
'port' => $oslomsg_notify_port,
'username' => $oslomsg_notify_username,
'password' => $oslomsg_notify_password,

10
manifests/profile/base/swift/proxy.pp
View File

@ -74,6 +74,10 @@
# (Optional) List of memcache servers
# Defaults to hiera('memcached_node_ips')
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
@ -103,7 +107,7 @@ class tripleo::profile::base::swift::proxy (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$ceilometer_enabled = true,
$ceilometer_messaging_driver = hiera('messaging_notify_service_name', 'rabbit'),
$ceilometer_messaging_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$ceilometer_messaging_hosts = hiera('rabbitmq_node_names', undef),
$ceilometer_messaging_password = hiera('swift::proxy::ceilometer::rabbit_password', undef),
$ceilometer_messaging_port = hiera('tripleo::profile::base::swift::proxy::rabbit_port', '5672'),
$ceilometer_messaging_use_ssl = '0',
@ -112,6 +116,7 @@ class tripleo::profile::base::swift::proxy (
$enable_internal_tls = hiera('enable_internal_tls', false),
$memcache_port = 11211,
$memcache_servers = hiera('memcached_node_ips'),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$step = Integer(hiera('step')),
$swift_proxy_network = hiera('swift_proxy_network', undef),
$tls_proxy_bind_ip = undef,
@ -160,11 +165,12 @@ class tripleo::profile::base::swift::proxy (
include ::swift::proxy::formpost
include ::swift::proxy::bulk
$ceilometer_messaging_use_ssl_real = sprintf('%s', bool2num(str2bool($ceilometer_messaging_use_ssl)))
$ceilometer_messaging_hosts_real = any2array(pick($ceilometer_messaging_hosts,$oslomsg_rpc_hosts, []))
if $ceilometer_enabled {
class { '::swift::proxy::ceilometer':
default_transport_url => os_transport_url({
'transport' => $ceilometer_messaging_driver,
'hosts' => $ceilometer_messaging_hosts,
'hosts' => $ceilometer_messaging_hosts_real,
'port' => sprintf('%s', $ceilometer_messaging_port),
'username' => $ceilometer_messaging_username,
'password' => $ceilometer_messaging_password,

12
manifests/profile/base/tacker.pp
View File

@ -22,13 +22,17 @@
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
# [*rabbit_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('messaging_rpc_service_name', rabbit)
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
@ -52,8 +56,9 @@
class tripleo::profile::base::tacker (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$rabbit_hosts = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_hosts = hiera('oslo_messaging_rpc_node_names', undef),
$oslomsg_rpc_password = hiera('tacker::rabbit_password'),
$oslomsg_rpc_port = hiera('tacker::rabbit_port', '5672'),
$oslomsg_rpc_username = hiera('tacker::rabbit_userid', 'guest'),
@ -68,11 +73,12 @@ class tripleo::profile::base::tacker (
if $step >= 4 or ($step >= 3 and $sync_db){
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
$oslomsg_rpc_hosts_real = any2array(pick($rabbit_hosts, $oslomsg_rpc_hosts, []))
class { '::tacker':
sync_db => $sync_db,
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
'hosts' => $oslomsg_rpc_hosts_real,
'port' => sprintf('%s', $oslomsg_rpc_port),
'username' => $oslomsg_rpc_username,
'password' => $oslomsg_rpc_password,

30
manifests/profile/pacemaker/rabbitmq.pp
View File

@ -18,10 +18,14 @@
#
# === Parameters
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# [*rabbit_bootstrap_node*]
# (Optional) The hostname of the rabbit node responsible for bootstrapping tasks
# Defaults to hiera('rabbitmq_short_bootstrap_node_name')
#
# [*oslomsg_rpc_bootstrap_node*]
# (Optional) The hostname of the rpc node responsible for bootstrapping tasks
# Defaults to hiera('oslo_messaging_rpc_short_bootstrap_node_name')
#
# [*erlang_cookie*]
# (Optional) Content of erlang cookie.
# Defaults to hiera('rabbitmq::erlang_cookie').
@ -36,6 +40,10 @@
# (Optional) The list of rabbitmq nodes names
# Defaults to hiera('rabbitmq_node_names')
#
# [*oslomsg_rpc_nodes*]
# (Optional) The list of oslo messaging rpc nodes names
# Defaults to hiera('oslo_messaging_rpc_node_names')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
@ -46,13 +54,16 @@
# Defaults to hiera('pcs_tries', 20)
#
class tripleo::profile::pacemaker::rabbitmq (
$bootstrap_node = hiera('rabbitmq_short_bootstrap_node_name'),
$erlang_cookie = hiera('rabbitmq::erlang_cookie'),
$user_ha_queues = hiera('rabbitmq::nr_ha_queues', 0),
$rabbit_nodes = hiera('rabbitmq_node_names'),
$pcs_tries = hiera('pcs_tries', 20),
$step = Integer(hiera('step')),
$rabbit_bootstrap_node = hiera('rabbitmq_short_bootstrap_node_name', undef),
$oslomsg_rpc_bootstrap_node = hiera('oslo_messaging_rpc_short_bootstrap_node_name', undef),
$erlang_cookie = hiera('rabbitmq::erlang_cookie'),
$user_ha_queues = hiera('rabbitmq::nr_ha_queues', 0),
$rabbit_nodes = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_nodes = hiera('oslo_messaging_rpc_node_names', undef),
$pcs_tries = hiera('pcs_tries', 20),
$step = Integer(hiera('step')),
) {
$bootstrap_node = pick($rabbit_bootstrap_node, $oslomsg_rpc_bootstrap_node, [])
if $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
@ -88,7 +99,8 @@ class tripleo::profile::pacemaker::rabbitmq (
include ::stdlib
# The default nr of ha queues is ceiling(N/2)
if $user_ha_queues == 0 {
$nr_rabbit_nodes = size($rabbit_nodes)
$messaging_nodes = pick($rabbit_nodes, $oslomsg_rpc_nodes, [])
$nr_rabbit_nodes = size($messaging_nodes)
$nr_ha_queues = $nr_rabbit_nodes / 2 + ($nr_rabbit_nodes % 2)
$params = "set_policy='ha-all ^(?!amq\\.).* {\"ha-mode\":\"exactly\",\"ha-params\":${nr_ha_queues}}'"
} elsif $user_ha_queues == -1 {

42
manifests/profile/pacemaker/rabbitmq_bundle.pp
View File

@ -26,10 +26,14 @@
# (Optional) The bundle's pacemaker_remote control port on the host
# Defaults to hiera('tripleo::profile::pacemaker::rabbitmq_bundle::control_port', '3122')
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# [*rabbit_bootstrap_node*]
# (Optional) The hostname of the rabbit node responsible for bootstrapping tasks
# Defaults to hiera('rabbitmq_short_bootstrap_node_name')
#
# [*oslomsg_rpc_bootstrap_node*]
# (Optional) The hostname of the rpc node responsible for bootstrapping tasks
# Defaults to hiera('oslo_messaging_rpc_short_bootstrap_node_name')
#
# [*erlang_cookie*]
# (Optional) Content of erlang cookie.
# Defaults to hiera('rabbitmq::erlang_cookie').
@ -42,7 +46,19 @@
#
# [*rabbit_nodes*]
# (Optional) The list of rabbitmq nodes names
# Defaults to hiera('rabbitmq_node_names')
# Defaults to hiera('rabbitmq_node_names', undef)
#
# [*oslomsg_rpc_nodes*]
# (Optional) The list of oslo messaging rpc nodes names
# Defaults to hiera('oslo_messaging_rpc_node_names', undef)
#
# [*rabbit_short_node_names*]
# (Optional) The list of rabbitmq short nodes names
# Defaults to hiera('rabbitmq_short_node_names', undef)
#
# [*oslomsg_rpc_short_node_names*]
# (Optional) The list of oslo messaging rpc shortnodes names
# Defaults to hiera('oslo_messaging_rpc_short_node_names', undef)
#
# [*enable_internal_tls*]
# (Optional) Whether TLS in the internal network is enabled or not.
@ -60,14 +76,20 @@
class tripleo::profile::pacemaker::rabbitmq_bundle (
$rabbitmq_docker_image = hiera('tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_image', undef),
$rabbitmq_docker_control_port = hiera('tripleo::profile::pacemaker::rabbitmq_bundle::control_port', '3122'),
$bootstrap_node = hiera('rabbitmq_short_bootstrap_node_name'),
$rabbit_bootstrap_node = hiera('rabbitmq_short_bootstrap_node_name', undef),
$oslomsg_rpc_bootstrap_node = hiera('oslo_messaging_rpc_short_bootstrap_node_name', undef),
$erlang_cookie = hiera('rabbitmq::erlang_cookie'),
$user_ha_queues = hiera('rabbitmq::nr_ha_queues', 0),
$rabbit_nodes = hiera('rabbitmq_node_names'),
$rabbit_nodes = hiera('rabbitmq_node_names', undef),
$oslomsg_rpc_nodes = hiera('oslo_messaging_rpc_node_names', undef),
$rabbit_short_node_names = hiera('rabbitmq_short_node_names', undef),
$oslomsg_rpc_short_node_names = hiera('oslo_messaging_rpc_short_node_names', undef),
$enable_internal_tls = hiera('enable_internal_tls', false),
$pcs_tries = hiera('pcs_tries', 20),
$step = Integer(hiera('step')),
) {
$messaging_nodes = pick($rabbit_nodes, $oslomsg_rpc_nodes)
$bootstrap_node = pick($rabbit_bootstrap_node, $oslomsg_rpc_bootstrap_node, [])
if $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
@ -95,9 +117,9 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
if $step >= 2 {
if $pacemaker_master {
$rabbitmq_short_node_names = hiera('rabbitmq_short_node_names')
$rabbitmq_nodes_count = count($rabbitmq_short_node_names)
$rabbitmq_short_node_names.each |String $node_name| {
$messaging_short_node_names = pick($rabbit_short_node_names, $oslomsg_rpc_short_node_names, [])
$rabbitmq_nodes_count = count($messaging_short_node_names)
$messaging_short_node_names.each |String $node_name| {
pacemaker::property { "rabbitmq-role-${node_name}":
property => 'rabbitmq-role',
value => true,
@ -199,7 +221,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
# The default nr of ha queues is ceiling(N/2)
if $user_ha_queues == 0 {
$nr_rabbit_nodes = size($rabbit_nodes)
$nr_rabbit_nodes = size($messaging_nodes)
$nr_ha_queues = $nr_rabbit_nodes / 2 + ($nr_rabbit_nodes % 2)
$params = "set_policy='ha-all ^(?!amq\\.).* {\"ha-mode\":\"exactly\",\"ha-params\":${nr_ha_queues}}'"
} elsif $user_ha_queues == -1 {
@ -225,7 +247,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
before => Exec['rabbitmq-ready'],
}
if size($rabbit_nodes) == 1 {
if size($messaging_nodes) == 1 {
$check_command = 'rabbitmqctl status | grep -F "{rabbit,"'
} else {
# This grep makes sure the rabbit app in erlang is up and running

5
releasenotes/notes/messaging-rabbitmq-or-oslo-messaging-services-f29943b2eafd24e6.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- Add support for either rabbitmq server nodes or new
oslo.messaging service nodes for separated rpc and notify
communications

20
spec/classes/tripleo_profile_base_qdr_spec.rb
View File

@ -34,7 +34,7 @@ describe 'tripleo::profile::base::qdr' do
:hostname => 'node.example.com',
})
params.merge!({
:qdr_node_names => ['node.example.com'],
:oslomsg_rpc_hosts => ['node.example.com'],
})
end
@ -53,14 +53,14 @@ describe 'tripleo::profile::base::qdr' do
:hostname => 'node1.example.com',
})
params.merge!({
:qdr_node_names => ['node1.example.com','node2.example.com','node3.example.com'],
:oslomsg_rpc_hosts => ['node1.example.com','node2.example.com','node3.example.com'],
})
end
it 'should set interior listener and no connectors' do
is_expected.to contain_class('qdr').with(
:router_mode => 'interior',
:extra_listeners => [{'host' => '0.0.0.0','port' => '25672','role' => 'inter-router'}],
:extra_listeners => [{'host' => '0.0.0.0','port' => '31460','role' => 'inter-router'}],
:connectors => [],
)
end
@ -72,15 +72,15 @@ describe 'tripleo::profile::base::qdr' do
:hostname => 'node2.example.com',
})
params.merge!({
:qdr_node_names => ['node1.example.com','node2.example.com','node3.example.com'],
:oslomsg_rpc_hosts => ['node1.example.com','node2.example.com','node3.example.com'],
})
end
it 'should set up interior listener and one connector' do
is_expected.to contain_class('qdr').with(
:router_mode => 'interior',
:extra_listeners => [{'host' => '0.0.0.0','port' => '25672','role' => 'inter-router'}],
:connectors => [{"host"=>"node1.example.com", "role"=>"inter-router", "port"=>"25672"}],
:extra_listeners => [{'host' => '0.0.0.0','port' => '31460','role' => 'inter-router'}],
:connectors => [{"host"=>"node1.example.com", "role"=>"inter-router", "port"=>"31460"}],
)
end
end
@ -91,17 +91,17 @@ describe 'tripleo::profile::base::qdr' do
:hostname => 'node3.example.com',
})
params.merge!({
:qdr_node_names => ['node1.example.com','node2.example.com','node3.example.com'],
:oslomsg_rpc_hosts => ['node1.example.com','node2.example.com','node3.example.com'],
})
end
it 'should set up interior listener and two connectors' do
is_expected.to contain_class('qdr').with(
:router_mode => 'interior',
:extra_listeners => [{'host' => '0.0.0.0','port' => '25672','role' => 'inter-router'}],
:extra_listeners => [{'host' => '0.0.0.0','port' => '31460','role' => 'inter-router'}],
:connectors => [
{"host"=>"node1.example.com", "role"=>"inter-router", "port"=>"25672"},
{"host"=>"node2.example.com", "role"=>"inter-router", "port"=>"25672"}],
{"host"=>"node1.example.com", "role"=>"inter-router", "port"=>"31460"},
{"host"=>"node2.example.com", "role"=>"inter-router", "port"=>"31460"}],
)
end
end