openstack
/
puppet-glance
Code Issues Proposed changes

Add oslo_messaging_notifications transport_url 

Adding the ability to configure the oslo_messaging_notifications
transport_url.

Change-Id: I55b718618d3ede8b0483bd8b4c0877339b6fc0b4
This commit is contained in:
Alex Schultz 2016-12-14 09:57:31 -07:00
parent 77d8f0f46c
commit 3c9a2a8611
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/notify/rabbitmq.pp
View File

@ -7,6 +7,11 @@
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default
#
# [*notification_transport_url*]
# (optional) Connection url for oslo messaging notification backend. An
# example rabbit url would be, rabbit://user:pass@host:port/virtual_host
# Defaults to $::os_service_default
#
# [*rabbit_ha_queues*]
# (Optional) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this
# option, you must wipe the RabbitMQ database. (boolean value)
@ -106,6 +111,7 @@
#
class glance::notify::rabbitmq(
$default_transport_url = $::os_service_default,
$notification_transport_url = $::os_service_default,
$rabbit_ha_queues = $::os_service_default,
$rabbit_heartbeat_timeout_threshold = $::os_service_default,
$rabbit_heartbeat_rate = $::os_service_default,
@ -169,8 +175,9 @@ deprecated. Please use glance::notify::rabbitmq::default_transport_url instead."
}
oslo::messaging::notifications { ['glance_api_config', 'glance_registry_config']:
driver => $notification_driver,
topics => $rabbit_notification_topic,
driver => $notification_driver,
transport_url => $notification_transport_url,
topics => $rabbit_notification_topic,
}
glance_api_config {

4
releasenotes/notes/notification_transport_url-c4ebcfa30e124c9e.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Add the ability to configure the oslo messaging notification transport url
via glance::notify::rabbit::notficiation_transport_url

2
spec/classes/glance_notify_rabbitmq_spec.rb
View File

@ -4,6 +4,7 @@ describe 'glance::notify::rabbitmq' do
shared_examples_for 'glance::notify::rabbitmq' do
describe 'when defaults with rabbit pass specified' do
it { is_expected.to contain_glance_api_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_glance_api_config('oslo_messaging_notifications/transport_url').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_glance_api_config('oslo_messaging_notifications/driver').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_password').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_password').with_value('<SERVICE DEFAULT>').with_secret(true) }
@ -21,6 +22,7 @@ describe 'glance::notify::rabbitmq' do
it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_glance_registry_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_glance_registry_config('oslo_messaging_notifications/transport_url').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_glance_registry_config('oslo_messaging_notifications/driver').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_glance_registry_config('oslo_messaging_rabbit/rabbit_password').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_glance_registry_config('oslo_messaging_rabbit/rabbit_password').with_value('<SERVICE DEFAULT>').with_secret(true) }