openstack/puppet-keystone
Code Issues Proposed changes

Add notification transport_url to support dual oslo_messaging backends

Browse Source 
Change-Id: I1cf93d2caebfa1f7373c16754a2ad9bd15eb1a40
This commit is contained in:
Andrew Smith 2017-01-23 14:52:16 -05:00
parent 8fd432157a
commit 918aa04bfa
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/init.pp
View File

@ -259,6 +259,12 @@
# (string value) # (string value)
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*notification_transport_url*]
# (optional) A URL representing the messaging driver to use for notifications
# and its full configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default
#
# [*notification_driver*] # [*notification_driver*]
# RPC driver. Not enabled by default (list value) # RPC driver. Not enabled by default (list value)
# Defaults to $::os_service_default # Defaults to $::os_service_default
@ -709,6 +715,7 @@ class keystone(
$kombu_reconnect_delay = $::os_service_default, $kombu_reconnect_delay = $::os_service_default,
$kombu_failover_strategy = $::os_service_default, $kombu_failover_strategy = $::os_service_default,
$kombu_compression = $::os_service_default, $kombu_compression = $::os_service_default,
$notification_transport_url = $::os_service_default,
$notification_driver = $::os_service_default, $notification_driver = $::os_service_default,
$notification_topics = $::os_service_default, $notification_topics = $::os_service_default,
$notification_format = $::os_service_default, $notification_format = $::os_service_default,
@ -1044,8 +1051,9 @@ Fernet or UUID tokens are recommended.")
} }
oslo::messaging::notifications { 'keystone_config': oslo::messaging::notifications { 'keystone_config':
driver => $notification_driver, transport_url => $notification_transport_url,
topics => $notification_topics, driver => $notification_driver,
topics => $notification_topics,
} }
oslo::messaging::rabbit { 'keystone_config': oslo::messaging::rabbit { 'keystone_config':

4
releasenotes/notes/add-notification-transport-url-2a2d023520d8301e.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Add oslo.messaging notification transport_url via puppet-oslo
resource.

3
spec/classes/keystone_init_spec.rb
View File

@ -57,6 +57,7 @@ describe 'keystone' do
'signing_cert_subject' => '<SERVICE DEFAULT>', 'signing_cert_subject' => '<SERVICE DEFAULT>',
'signing_key_size' => '<SERVICE DEFAULT>', 'signing_key_size' => '<SERVICE DEFAULT>',
'default_transport_url' => '<SERVICE DEFAULT>', 'default_transport_url' => '<SERVICE DEFAULT>',
'notification_transport_url' => '<SERVICE DEFAULT>',
'rabbit_host' => '<SERVICE DEFAULT>', 'rabbit_host' => '<SERVICE DEFAULT>',
'rabbit_password' => '<SERVICE DEFAULT>', 'rabbit_password' => '<SERVICE DEFAULT>',
'rabbit_userid' => '<SERVICE DEFAULT>', 'rabbit_userid' => '<SERVICE DEFAULT>',
@ -109,6 +110,7 @@ describe 'keystone' do
'signing_cert_subject' => '/C=US/ST=Unset/L=Unset/O=Unset/CN=www.example.com', 'signing_cert_subject' => '/C=US/ST=Unset/L=Unset/O=Unset/CN=www.example.com',
'signing_key_size' => 2048, 'signing_key_size' => 2048,
'default_transport_url' => 'rabbit://user:pass@host:1234/virt', 'default_transport_url' => 'rabbit://user:pass@host:1234/virt',
'notification_transport_url' => 'rabbit://user:pass@host:1234/virt',
'rabbit_host' => '127.0.0.1', 'rabbit_host' => '127.0.0.1',
'rabbit_password' => 'openstack', 'rabbit_password' => 'openstack',
'rabbit_userid' => 'admin', 'rabbit_userid' => 'admin',
@ -737,6 +739,7 @@ describe 'keystone' do
default_params default_params
end end
it { is_expected.to contain_keystone_config('oslo_messaging_notifications/transport_url').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_keystone_config('oslo_messaging_notifications/driver').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_keystone_config('oslo_messaging_notifications/driver').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_keystone_config('oslo_messaging_notifications/topics').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_keystone_config('oslo_messaging_notifications/topics').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_keystone_config('DEFAULT/notification_format').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_keystone_config('DEFAULT/notification_format').with_value('<SERVICE DEFAULT>') }