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
Pass ServiceNetMap to services
[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
2021538
..
a7ecacf
100644
(file)
--- a/
puppet/services/gnocchi-metricd.yaml
+++ b/
puppet/services/gnocchi-metricd.yaml
@@
-4,6
+4,12
@@
description: >
Gnocchi service configured with Puppet
parameters:
Gnocchi service configured with Puppet
parameters:
+ ServiceNetMap:
+ default: {}
+ description: Mapping of service_name -> network name. Typically set
+ via parameter_defaults in the resource registry. This
+ mapping overrides those in ServiceNetMapDefaults.
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-14,13
+20,14
@@
resources:
GnocchiServiceBase:
type: ./gnocchi-base.yaml
properties:
GnocchiServiceBase:
type: ./gnocchi-base.yaml
properties:
+ ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:
description: Role data for the Gnocchi role.
value:
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:
description: Role data for the Gnocchi role.
value:
- service_name: gnocchi
-
metricd
+ service_name: gnocchi
_
metricd
config_settings:
map_merge:
- get_attr: [GnocchiServiceBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [GnocchiServiceBase, role_data, config_settings]