From 918aa04bfa1ff08af6960ce816ecfc343ca82fc4 Mon Sep 17 00:00:00 2001
From: Andrew Smith <ansmith@redhat.com>
Date: Mon, 23 Jan 2017 14:52:16 -0500
Subject: [PATCH] Add notification transport_url to support dual oslo_messaging
 backends

Change-Id: I1cf93d2caebfa1f7373c16754a2ad9bd15eb1a40
---
 manifests/init.pp                                    | 12 ++++++++++--
 ...-notification-transport-url-2a2d023520d8301e.yaml |  4 ++++
 spec/classes/keystone_init_spec.rb                   |  3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/add-notification-transport-url-2a2d023520d8301e.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index b26356932..4c2e0d3e0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -259,6 +259,12 @@
 #   (string value)
 #   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*]
 #   RPC driver. Not enabled by default (list value)
 #   Defaults to $::os_service_default
@@ -709,6 +715,7 @@ class keystone(
   $kombu_reconnect_delay                = $::os_service_default,
   $kombu_failover_strategy              = $::os_service_default,
   $kombu_compression                    = $::os_service_default,
+  $notification_transport_url           = $::os_service_default,
   $notification_driver                  = $::os_service_default,
   $notification_topics                  = $::os_service_default,
   $notification_format                  = $::os_service_default,
@@ -1044,8 +1051,9 @@ Fernet or UUID tokens are recommended.")
   }
 
   oslo::messaging::notifications { 'keystone_config':
-    driver => $notification_driver,
-    topics => $notification_topics,
+    transport_url => $notification_transport_url,
+    driver        => $notification_driver,
+    topics        => $notification_topics,
   }
 
   oslo::messaging::rabbit { 'keystone_config':
diff --git a/releasenotes/notes/add-notification-transport-url-2a2d023520d8301e.yaml b/releasenotes/notes/add-notification-transport-url-2a2d023520d8301e.yaml
new file mode 100644
index 000000000..71c1dfa06
--- /dev/null
+++ b/releasenotes/notes/add-notification-transport-url-2a2d023520d8301e.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - Add oslo.messaging notification transport_url via puppet-oslo
+    resource.
diff --git a/spec/classes/keystone_init_spec.rb b/spec/classes/keystone_init_spec.rb
index 9f6bb81a6..7e484fb88 100644
--- a/spec/classes/keystone_init_spec.rb
+++ b/spec/classes/keystone_init_spec.rb
@@ -57,6 +57,7 @@ describe 'keystone' do
       'signing_cert_subject'               => '<SERVICE DEFAULT>',
       'signing_key_size'                   => '<SERVICE DEFAULT>',
       'default_transport_url'              => '<SERVICE DEFAULT>',
+      'notification_transport_url'         => '<SERVICE DEFAULT>',
       'rabbit_host'                        => '<SERVICE DEFAULT>',
       'rabbit_password'                    => '<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_key_size'                   => 2048,
       '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_password'                    => 'openstack',
       'rabbit_userid'                      => 'admin',
@@ -737,6 +739,7 @@ describe 'keystone' do
       default_params
     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/topics').with_value('<SERVICE DEFAULT>') }
     it { is_expected.to contain_keystone_config('DEFAULT/notification_format').with_value('<SERVICE DEFAULT>') }