Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Increase libvirt/qemu.conf max_files and max_processes"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
cinder-scheduler.yaml
diff --git
a/puppet/services/cinder-scheduler.yaml
b/puppet/services/cinder-scheduler.yaml
index
129706b
..
3dd3f64
100644
(file)
--- a/
puppet/services/cinder-scheduler.yaml
+++ b/
puppet/services/cinder-scheduler.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-04-08
+heat_template_version:
ocata
description: >
OpenStack Cinder Scheduler service configured with Puppet
description: >
OpenStack Cinder Scheduler service configured with Puppet
@@
-18,6
+18,14
@@
parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
+ MonitoringSubscriptionCinderScheduler:
+ default: 'overcloud-cinder-scheduler'
+ type: string
+ CinderSchedulerLoggingSource:
+ type: json
+ default:
+ tag: openstack.cinder.scheduler
+ path: /var/log/cinder/cinder-scheduler.log
resources:
resources:
@@
-33,6
+41,10
@@
outputs:
description: Role data for the Cinder Scheduler role.
value:
service_name: cinder_scheduler
description: Role data for the Cinder Scheduler role.
value:
service_name: cinder_scheduler
+ monitoring_subscription: {get_param: MonitoringSubscriptionCinderScheduler}
+ logging_source: {get_param: CinderSchedulerLoggingSource}
+ logging_groups:
+ - cinder
config_settings:
map_merge:
- get_attr: [CinderBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [CinderBase, role_data, config_settings]