diff --git a/manifests/api.pp b/manifests/api.pp index 80ce5b4c..4dbdd257 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -46,6 +46,19 @@ # would be, rabbit://user:pass@host:port/virtual_host # Defaults to $::os_service_default # +# [*notification_transport_url*] +# (optional) Connection url for oslo messaging notifications backend. An +# example rabbit url would be, rabbit://user:pass@host:port/virtual_host +# Defaults to $::os_service_default +# +# [*notification_driver*] +# (optional) Driver to use for oslo messaging notifications backend. +# Defaults to $::os_service_default +# +# [*notification_topics*] +# (optional) Topics to use for oslo messaging notifications backend. +# Defaults to $::os_service_default +# # [*rabbit_use_ssl*] # (optional) Connect over SSL for RabbitMQ # Defaults to $::os_service_default @@ -236,6 +249,9 @@ class barbican::api ( $max_allowed_request_size_in_bytes = $::os_service_default, $rpc_backend = $::os_service_default, $default_transport_url = $::os_service_default, + $notification_transport_url = $::os_service_default, + $notification_driver = $::os_service_default, + $notification_topics = $::os_service_default, $rabbit_use_ssl = $::os_service_default, $rabbit_heartbeat_timeout_threshold = $::os_service_default, $rabbit_heartbeat_rate = $::os_service_default, @@ -355,6 +371,12 @@ deprecated. Please use barbican::default_transport_url instead.") transport_url => $default_transport_url, } + oslo::messaging::notifications { 'barbican_config': + driver => $notification_driver, + transport_url => $notification_transport_url, + topics => $notification_topics, + } + # queue options barbican_config { 'queue/enable': value => $enable_queue; diff --git a/releasenotes/notes/notification_transport_url-ff4afeed02b55280.yaml b/releasenotes/notes/notification_transport_url-ff4afeed02b55280.yaml new file mode 100644 index 00000000..180890b6 --- /dev/null +++ b/releasenotes/notes/notification_transport_url-ff4afeed02b55280.yaml @@ -0,0 +1,5 @@ +--- +features: + - Add the ability to configure the oslo messaging notification options + via barbican::api::notification_transport_url, + barbican::api::notification_driver, and barbican::api::notification_topics diff --git a/spec/classes/barbican_api_spec.rb b/spec/classes/barbican_api_spec.rb index bd1925ba..a8c2c265 100644 --- a/spec/classes/barbican_api_spec.rb +++ b/spec/classes/barbican_api_spec.rb @@ -29,6 +29,9 @@ describe 'barbican::api' do :bind_port => '9311', :rpc_backend => 'rabbit', :default_transport_url => '', + :notification_transport_url => '', + :notification_driver => '', + :notification_topics => '', :rabbit_host => '', :rabbit_hosts => [''], :rabbit_password => '', @@ -71,6 +74,9 @@ describe 'barbican::api' do :bind_port => '9312', :rpc_backend => 'rabbit', :default_transport_url => 'rabbit://bugs:bugs_bunny@localhost:1234/rabbithost', + :notification_transport_url => 'rabbit://bugs:bugs_bunny@localhost:1234/rabbithost', + :notification_driver => 'kombu', + :notification_topics => 'notifications', :rabbit_host => 'rabbithost', :rabbit_hosts => ['rabbithost:1234'], :rabbit_password => 'bugs_bunny', @@ -153,6 +159,9 @@ describe 'barbican::api' do it 'configures rabbit' do is_expected.to contain_barbican_config('DEFAULT/rpc_backend').with_value(param_hash[:rpc_backend]) is_expected.to contain_barbican_config('DEFAULT/transport_url').with_value(param_hash[:default_transport_url]) + is_expected.to contain_barbican_config('oslo_messaging_notifications/transport_url').with_value(param_hash[:notification_transport_url]) + is_expected.to contain_barbican_config('oslo_messaging_notifications/driver').with_value(param_hash[:notification_driver]) + is_expected.to contain_barbican_config('oslo_messaging_notifications/topics').with_value(param_hash[:notification_topics]) is_expected.to contain_barbican_config('oslo_messaging_rabbit/rabbit_hosts').with_value(param_hash[:rabbit_hosts]) is_expected.to contain_barbican_config('oslo_messaging_rabbit/rabbit_password').with_value(param_hash[:rabbit_password]).with_secret(true) is_expected.to contain_barbican_config('oslo_messaging_rabbit/rabbit_userid').with_value(param_hash[:rabbit_userid])