From b59fc5506a5446eb84f606aed65e97e709b3f902 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 8 Nov 2016 12:43:44 -0700 Subject: [PATCH] Add default_transport_url option Change-Id: I891570dde75dc58f45e5ad6386be9e522b2706eb (cherry picked from commit 1b123d9be52295af54a29146268be7a94ea12f85) --- manifests/notify/rabbitmq.pp | 10 ++++++++++ spec/classes/glance_notify_rabbitmq_spec.rb | 12 ++++++++++++ 2 files changed, 22 insertions(+) diff --git a/manifests/notify/rabbitmq.pp b/manifests/notify/rabbitmq.pp index 2ad85da4..72d36b56 100644 --- a/manifests/notify/rabbitmq.pp +++ b/manifests/notify/rabbitmq.pp @@ -1,6 +1,12 @@ # # used to configure rabbitmq notifications for glance # +# [*default_transport_url*] +# (optional) A URL representing the messaging driver to use and its full +# configuration. Transport URLs take the form: +# transport://user:pass@host1:port[,hostN:portN]/virtual_host +# Defaults to $::os_service_default +# # [*rabbit_password*] # (Optional) The RabbitMQ password. (string value) # Defaults to $::os_service_default @@ -97,6 +103,7 @@ # Defaults to $::os_service_default # class glance::notify::rabbitmq( + $default_transport_url = $::os_service_default, $rabbit_password = $::os_service_default, $rabbit_userid = $::os_service_default, $rabbit_host = $::os_service_default, @@ -141,6 +148,9 @@ class glance::notify::rabbitmq( kombu_compression => $kombu_compression, } + oslo::messaging::default { ['glance_api_config', 'glance_registry_config']: + transport_url => $default_transport_url, + } oslo::messaging::notifications { ['glance_api_config', 'glance_registry_config']: driver => $notification_driver, diff --git a/spec/classes/glance_notify_rabbitmq_spec.rb b/spec/classes/glance_notify_rabbitmq_spec.rb index f0efcd75..4c8c9ff9 100644 --- a/spec/classes/glance_notify_rabbitmq_spec.rb +++ b/spec/classes/glance_notify_rabbitmq_spec.rb @@ -3,6 +3,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('') } it { is_expected.to contain_glance_api_config('oslo_messaging_notifications/driver').with_value('') } it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_password').with_value('') } it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_password').with_value('').with_secret(true) } @@ -19,6 +20,7 @@ describe 'glance::notify::rabbitmq' do it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/heartbeat_rate').with_value('') } it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('') } + it { is_expected.to contain_glance_registry_config('DEFAULT/transport_url').with_value('') } it { is_expected.to contain_glance_registry_config('oslo_messaging_notifications/driver').with_value('') } it { is_expected.to contain_glance_registry_config('oslo_messaging_rabbit/rabbit_password').with_value('') } it { is_expected.to contain_glance_registry_config('oslo_messaging_rabbit/rabbit_password').with_value('').with_secret(true) } @@ -191,6 +193,16 @@ describe 'glance::notify::rabbitmq' do it { is_expected.to contain_glance_registry_config('oslo_messaging_rabbit/heartbeat_rate').with_value('10') } end + describe 'when passing params transport_url' do + let :params do + { + :default_transport_url => 'rabbit://user:pass@host:1234/virt', + } + end + it { is_expected.to contain_glance_api_config('DEFAULT/transport_url').with_value('rabbit://user:pass@host:1234/virt') } + it { is_expected.to contain_glance_registry_config('DEFAULT/transport_url').with_value('rabbit://user:pass@host:1234/virt') } + end + end on_supported_os({