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 "Add Octavia API service definitions"
[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
bd0a821
..
6a0b1f2
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
@@
-10,11
+10,22
@@
parameters:
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
+ DefaultPasswords:
+ default: {}
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
EndpointMap:
default: {}
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:
@@
-22,6
+33,7
@@
resources:
type: ./cinder-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
type: ./cinder-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs:
EndpointMap: {get_param: EndpointMap}
outputs:
@@
-29,9
+41,17
@@
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]
- cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
step_config: |
include ::tripleo::profile::base::cinder::scheduler
config_settings:
map_merge:
- get_attr: [CinderBase, role_data, config_settings]
- cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
step_config: |
include ::tripleo::profile::base::cinder::scheduler
+ upgrade_tasks:
+ - name: Stop cinder_scheduler service
+ tags: step2
+ service: name=openstack-cinder-scheduler state=stopped