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 novajoin entries to the TLS-everywhere environment file"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
gnocchi-metricd.yaml
diff --git
a/puppet/services/gnocchi-metricd.yaml
b/puppet/services/gnocchi-metricd.yaml
index
df342eb
..
d888e2a
100644
(file)
--- a/
puppet/services/gnocchi-metricd.yaml
+++ b/
puppet/services/gnocchi-metricd.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-04-08
+heat_template_version:
ocata
description: >
Gnocchi service configured with Puppet
description: >
Gnocchi service configured with Puppet
@@
-18,6
+18,13
@@
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
+ MonitoringSubscriptionGnocchiMetricd:
+ default: 'overcloud-gnocchi-metricd'
+ type: string
+ GnocchiMetricdWorkers:
+ default: '%{::os_workers}'
+ description: Number of workers for Gnocchi MetricD
+ type: string
resources:
GnocchiServiceBase:
resources:
GnocchiServiceBase:
@@
-32,9
+39,14
@@
outputs:
description: Role data for the Gnocchi role.
value:
service_name: gnocchi_metricd
description: Role data for the Gnocchi role.
value:
service_name: gnocchi_metricd
+ monitoring_subscription: {get_param: MonitoringSubscriptionGnocchiMetricd}
config_settings:
map_merge:
- get_attr: [GnocchiServiceBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [GnocchiServiceBase, role_data, config_settings]
- - gnocchi::metricd::
manage_service: false
+ - gnocchi::metricd::
workers: {get_param: GnocchiMetricdWorkers}
step_config: |
include ::tripleo::profile::base::gnocchi::metricd
step_config: |
include ::tripleo::profile::base::gnocchi::metricd
+ upgrade_tasks:
+ - name: Stop gnocchi_metricd service
+ tags: step2
+ service: name=openstack-gnocchi-metricd state=stopped