x
/
fuel-plugin-detach-rabbitmq
Code Issues Proposed changes

Add transport_url handling 

Change-Id: I1868473bff4f6e4b91354d8da34d35bf488ab948
Closes-Bug: 1670324
This commit is contained in:
Oleksiy Molchanov 2017-03-10 17:50:09 +02:00
parent a523491b99
commit ca3f2f0091
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
deployment_scripts/rabbitmq_hiera_override.pp
View File

@ -15,11 +15,27 @@ if ($detach_rabbitmq_plugin) {
'mgmt/messaging'
)
$rabbit_nodes_ips = values($rabbit_address_map)
$rabbit_nodes_names = keys($rabbit_address_map)
$amqp_hosts = values($rabbit_address_map)
$amqp_port = hiera('amqp_port', '5673')
$amqp_hosts = $rabbit_nodes_ips
$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') {
/standalone-rabbitmq/: {
@ -39,6 +55,7 @@ require "yaml"
amqp_hosts = @amqp_hosts.map {|x| x + ":" + @amqp_port}.join(",")
data = {
"amqp_hosts" => amqp_hosts,
"transport_url" => @transport_url,
"rabbit" => {
"enabled" => @rabbit_enabled,
},