X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fkeystone.yaml;h=630cc78e697c4bfe7102c30977a62ef5f827f568;hb=refs%2Fheads%2Fmaster;hp=8796209ba3ba61da356947fce4c7182dba2fc92e;hpb=5495b89f5fb8ce0e831955470ef58f52044b82f4;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 8796209b..630cc78e 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -28,6 +28,10 @@ parameters:
     type: string
     constraints:
       - allowed_values: [ 'basic', 'cadf' ]
+  KeystoneNotificationTopics:
+    description: Keystone notification topics to enable
+    default: []
+    type: comma_delimited_list
   KeystoneRegion:
     type: string
     default: 'regionOne'
@@ -178,10 +182,10 @@ parameters:
         Cron to purge expired tokens - Week Day
     default: '*'
   KeystoneCronTokenFlushMaxDelay:
-    type: string
+    type: number
     description: >
         Cron to purge expired tokens - Max Delay
-    default: '0'
+    default: 0
   KeystoneCronTokenFlushDestination:
     type: string
     description: >
@@ -296,6 +300,7 @@ outputs:
             keystone::rabbit_port: {get_param: RabbitClientPort}
             keystone::notification_driver: {get_param: NotificationDriver}
             keystone::notification_format: {get_param: KeystoneNotificationFormat}
+            tripleo::profile::base::keystone::extra_notification_topics: {get_param: KeystoneNotificationTopics}
             keystone::roles::admin::email: {get_param: AdminEmail}
             keystone::roles::admin::password: {get_param: AdminPassword}
             keystone::endpoint::public_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
@@ -400,12 +405,9 @@ outputs:
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
       upgrade_tasks:
-        yaql:
-          expression: $.data.apache_upgrade + $.data.keystone_upgrade
-          data:
-            apache_upgrade:
-              get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-            keystone_upgrade:
-              - name: Stop keystone service (running under httpd)
-                tags: step1
-                service: name=httpd state=stopped
+        list_concat:
+          - get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
+          -
+            - name: Stop keystone service (running under httpd)
+              tags: step1
+              service: name=httpd state=stopped