Merge "Enable notification from Keystone when Barbican is enabled" into stable/wallaby

deployment/keystone/keystone-container-puppet.yaml

@@ -181,6 +181,12 @@ parameters:
     type: comma_delimited_list
     default: 'noop'
     description: Driver or drivers to handle sending notifications.
+  KeystoneNotificationDriver:
+    type: comma_delimited_list
+    default: []
+    description: |
+      Driver or drivers to handle sending notifications. This parameter is
+      specific to Keystone.
   KeystoneEnableDBPurge:
     default: true
     description: |
@@ -423,6 +429,7 @@ conditions:
   password_regex_description_set: {not: {equals: [{get_param: KeystonePasswordRegexDescription}, '']}}
   unique_last_password_count_set: {not: {equals: [{get_param: KeystoneUniqueLastPasswordCount}, '']}}
   cors_allowed_origin_set: {not: {equals : [{get_param: KeystoneCorsAllowedOrigin}, '']}}
+  keystone_notification_driver_set: {not: {equals: [{get_param: KeystoneNotificationDriver}, []]}}
 
 outputs:
   role_data:
@@ -490,7 +497,11 @@ outputs:
               - {get_param: KeystoneDebug}
               - true
               - {get_param: Debug }
-            keystone::notification_driver: {get_param: NotificationDriver}
+            keystone::notification_driver:
+              if:
+              - keystone_notification_driver_set
+              - {get_param: KeystoneNotificationDriver}
+              - {get_param: NotificationDriver}
             keystone::notification_format: {get_param: KeystoneNotificationFormat}
             tripleo::profile::base::keystone::extra_notification_topics: {get_param: KeystoneNotificationTopics}
             keystone_enable_db_purge: {get_param: KeystoneEnableDBPurge}

environments/services-baremetal/barbican.yaml

@@ -2,3 +2,6 @@
 # Barbican with the default secret store backend.
 resource_registry:
   OS::TripleO::Services::BarbicanApi: ../../deployment/barbican/barbican-api-container-puppet.yaml
+
+parameter_defaults:
+  KeystoneNotificationDriver: messagingv2

environments/services/barbican.yaml

@@ -2,3 +2,6 @@
 # Barbican with the default secret store backend.
 resource_registry:
   OS::TripleO::Services::BarbicanApi: ../../deployment/barbican/barbican-api-container-puppet.yaml
+
+parameter_defaults:
+  KeystoneNotificationDriver: messagingv2

releasenotes/notes/keystone-notification-driver-0c71165430eb57ef.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    The new ``KeystoneNotificationDriver`` parameter has been added.
+    This parameter overrides the global ``NotificationDriver`` parameter and
+    allows customizing notification driver only in Keystone, which is required
+    to use notification listner function in Barbican.