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 base neutron service configuration"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
gnocchi-api.yaml
diff --git
a/puppet/services/gnocchi-api.yaml
b/puppet/services/gnocchi-api.yaml
index
d21e5b2
..
650865e
100644
(file)
--- a/
puppet/services/gnocchi-api.yaml
+++ b/
puppet/services/gnocchi-api.yaml
@@
-23,7
+23,7
@@
parameters:
type: string
hidden: true
GnocchiBackend:
type: string
hidden: true
GnocchiBackend:
- default:
file
+ default:
swift
description: The short name of the Gnocchi backend to use. Should be one
of swift, rbd, or file
type: string
description: The short name of the Gnocchi backend to use. Should be one
of swift, rbd, or file
type: string
@@
-33,8
+33,12
@@
parameters:
type: string
default: 'regionOne'
description: Keystone region for endpoint
type: string
default: 'regionOne'
description: Keystone region for endpoint
+ MonitoringSubscriptionGnocchiApi:
+ default: 'overcloud-gnocchi-api'
+ type: string
resources:
resources:
+
GnocchiServiceBase:
type: ./gnocchi-base.yaml
properties:
GnocchiServiceBase:
type: ./gnocchi-base.yaml
properties:
@@
-42,13
+46,22
@@
resources:
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
+ ApacheServiceBase:
+ type: ./apache.yaml
+ properties:
+ ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
+ EndpointMap: {get_param: EndpointMap}
+
outputs:
role_data:
description: Role data for the Gnocchi role.
value:
service_name: gnocchi_api
outputs:
role_data:
description: Role data for the Gnocchi role.
value:
service_name: gnocchi_api
+ monitoring_subscription: {get_param: MonitoringSubscriptionGnocchiApi}
config_settings:
map_merge:
config_settings:
map_merge:
+ - get_attr: [ApacheServiceBase, role_data, config_settings]
- get_attr: [GnocchiServiceBase, role_data, config_settings]
- tripleo.gnocchi_api.firewall_rules:
'129 gnocchi-api':
- get_attr: [GnocchiServiceBase, role_data, config_settings]
- tripleo.gnocchi_api.firewall_rules:
'129 gnocchi-api':