Mend murano endpoints and rabbitmq hosts
In a case with detached rabbitmq/keystone services point murano out the proper options of endpoints and rabbitmq hosts. Change-Id: Id207922a39d599cfeffab98d52fc6271dd084563 Closes-Bug: #1492203
This commit is contained in:
parent
befb7243e4
commit
959082ee5d
|
@ -40,9 +40,9 @@
|
|||
# (Optional) Notification driver to use
|
||||
# Defaults to 'messagingv2'
|
||||
#
|
||||
# [*rabbit_os_host*]
|
||||
# (Optional) Host for openstack rabbit server
|
||||
# Defaults to '127.0.0.1'
|
||||
# [*rabbit_os_hosts*]
|
||||
# (Optional) List of clustered rabbit servers.
|
||||
# Defaults to '['127.0.0.1:5672']'
|
||||
#
|
||||
# [*rabbit_os_port*]
|
||||
# (Optional) Port for openstack rabbit server
|
||||
|
@ -142,7 +142,7 @@ class murano(
|
|||
$log_dir = '/var/log/murano',
|
||||
$data_dir = '/var/cache/murano',
|
||||
$notification_driver = 'messagingv2',
|
||||
$rabbit_os_host = '127.0.0.1',
|
||||
$rabbit_os_hosts = ['127.0.0.1:5672'],
|
||||
$rabbit_os_port = '5672',
|
||||
$rabbit_os_user = 'guest',
|
||||
$rabbit_os_password = 'guest',
|
||||
|
@ -229,7 +229,7 @@ class murano(
|
|||
|
||||
'oslo_messaging_rabbit/rabbit_userid' : value => $rabbit_os_user;
|
||||
'oslo_messaging_rabbit/rabbit_password' : value => $rabbit_os_password;
|
||||
'oslo_messaging_rabbit/rabbit_hosts' : value => $rabbit_os_host;
|
||||
'oslo_messaging_rabbit/rabbit_hosts' : value => join($rabbit_os_hosts, ',');
|
||||
'oslo_messaging_rabbit/rabbit_port' : value => $rabbit_os_port;
|
||||
'oslo_messaging_rabbit/rabbit_ha_queues': value => $rabbit_ha_queues;
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@ notice('MODULAR: murano/keystone.pp')
|
|||
$murano_hash = hiera_hash('murano_hash', {})
|
||||
$public_ip = hiera('public_vip')
|
||||
$management_ip = hiera('management_vip')
|
||||
$service_endpoint = hiera('service_endpoint', $management_ip)
|
||||
$public_ssl = hiera('public_ssl')
|
||||
$region = hiera('region', 'RegionOne')
|
||||
|
||||
|
@ -22,7 +21,7 @@ $api_bind_port = '8082'
|
|||
|
||||
$tenant = pick($murano_hash['tenant'], 'services')
|
||||
$public_url = "${public_protocol}://${public_address}:${api_bind_port}"
|
||||
$admin_url = "http://${service_endpoint}:${api_bind_port}"
|
||||
$admin_url = "http://${management_ip}:${api_bind_port}"
|
||||
|
||||
#################################################################
|
||||
|
||||
|
|
|
@ -89,7 +89,7 @@ if $murano_hash['enabled'] {
|
|||
rabbit_os_user => $rabbit_hash['user'],
|
||||
rabbit_os_password => $rabbit_hash['password'],
|
||||
rabbit_os_port => $amqp_port,
|
||||
rabbit_os_host => split($amqp_hosts, ','),
|
||||
rabbit_os_hosts => split($amqp_hosts, ','),
|
||||
rabbit_ha_queues => $rabbit_ha_queues,
|
||||
rabbit_own_host => $public_ip,
|
||||
rabbit_own_port => '55572',
|
||||
|
|
|
@ -82,7 +82,7 @@ describe manifest do
|
|||
'rabbit_os_user' => rabbit_os_user,
|
||||
'rabbit_os_password' => rabbit_os_password,
|
||||
'rabbit_os_port' => amqp_port,
|
||||
'rabbit_os_host' => amqp_hosts.split(','),
|
||||
'rabbit_os_hosts' => amqp_hosts.split(','),
|
||||
'rabbit_ha_queues' => rabbit_ha_queues,
|
||||
'rabbit_own_host' => public_ip,
|
||||
'rabbit_own_port' => '55572',
|
||||
|
|
Loading…
Reference in New Issue