aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/ceilometer-base.yaml2
-rw-r--r--puppet/services/keystone.yaml5
2 files changed, 7 insertions, 0 deletions
diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index 55ee9675..140e39e8 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -174,6 +174,8 @@ outputs:
ceilometer::keystone::auth::region: {get_param: KeystoneRegion}
ceilometer::keystone::auth::tenant: 'service'
ceilometer::keystone::auth::configure_endpoint: {get_param: CeilometerApiEndpoint}
+ # Enable default notification queue
+ tripleo::profile::base::keystone::ceilometer_notification_topics: ["notifications"]
mysql:
ceilometer::db::mysql::password: {get_param: CeilometerPassword}
ceilometer::db::mysql::user: ceilometer
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 6301314a..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'
@@ -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]}