Add transport_url handling
Change-Id: I1868473bff4f6e4b91354d8da34d35bf488ab948 Closes-Bug: 1670324
This commit is contained in:
parent
a523491b99
commit
106f46c92f
@ -15,12 +15,28 @@ if ($detach_rabbitmq_plugin) {
|
|||||||
'mgmt/messaging'
|
'mgmt/messaging'
|
||||||
)
|
)
|
||||||
|
|
||||||
$rabbit_nodes_ips = values($rabbit_address_map)
|
$amqp_hosts = values($rabbit_address_map)
|
||||||
$rabbit_nodes_names = keys($rabbit_address_map)
|
|
||||||
|
|
||||||
$amqp_hosts = $rabbit_nodes_ips
|
|
||||||
$amqp_port = hiera('amqp_port', '5673')
|
$amqp_port = hiera('amqp_port', '5673')
|
||||||
|
|
||||||
|
$rabbit_hash = hiera_hash('rabbit', {})
|
||||||
|
|
||||||
|
if !$rabbit_hash['user'] {
|
||||||
|
$real_rabbit_hash = merge($rabbit_hash, { 'user' => 'nova' })
|
||||||
|
} else {
|
||||||
|
$real_rabbit_hash = $rabbit_hash
|
||||||
|
}
|
||||||
|
|
||||||
|
$rabbit_user = $real_rabbit_hash['user']
|
||||||
|
$rabbit_password = $real_rabbit_hash['password']
|
||||||
|
|
||||||
|
$transport_url = os_transport_url({
|
||||||
|
'transport' => 'rabbit',
|
||||||
|
'hosts' => $amqp_hosts,
|
||||||
|
'port' => $amqp_port,
|
||||||
|
'username' => $rabbit_user,
|
||||||
|
'password' => $rabbit_password,
|
||||||
|
})
|
||||||
|
|
||||||
case hiera_array('roles', 'none') {
|
case hiera_array('roles', 'none') {
|
||||||
/standalone-rabbitmq/: {
|
/standalone-rabbitmq/: {
|
||||||
$rabbit_enabled = true
|
$rabbit_enabled = true
|
||||||
@ -37,8 +53,10 @@ if ($detach_rabbitmq_plugin) {
|
|||||||
$calculated_content = inline_template('<%
|
$calculated_content = inline_template('<%
|
||||||
require "yaml"
|
require "yaml"
|
||||||
amqp_hosts = @amqp_hosts.map {|x| x + ":" + @amqp_port}.join(",")
|
amqp_hosts = @amqp_hosts.map {|x| x + ":" + @amqp_port}.join(",")
|
||||||
|
|
||||||
data = {
|
data = {
|
||||||
"amqp_hosts" => amqp_hosts,
|
"amqp_hosts" => amqp_hosts,
|
||||||
|
"transport_url" => @transport_url,
|
||||||
"rabbit" => {
|
"rabbit" => {
|
||||||
"enabled" => @rabbit_enabled,
|
"enabled" => @rabbit_enabled,
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user