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 "Modify external loadbalancer environments to use new FixedIPs"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
pacemaker
/
glance-api.yaml
diff --git
a/puppet/services/pacemaker/glance-api.yaml
b/puppet/services/pacemaker/glance-api.yaml
index
0fc17b2
..
20a439f
100644
(file)
--- a/
puppet/services/pacemaker/glance-api.yaml
+++ b/
puppet/services/pacemaker/glance-api.yaml
@@
-4,6
+4,15
@@
description: >
OpenStack Glance API service with Pacemaker configured with Puppet.
parameters:
OpenStack Glance API service with Pacemaker 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
+ DefaultPasswords:
+ default: {}
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-39,6
+48,8
@@
resources:
GlanceApiBase:
type: ../glance-api.yaml
properties:
GlanceApiBase:
type: ../glance-api.yaml
properties:
+ ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs:
EndpointMap: {get_param: EndpointMap}
outputs:
@@
-46,6
+57,9
@@
outputs:
description: Role data for the Glance role.
value:
service_name: glance_api
description: Role data for the Glance role.
value:
service_name: glance_api
+ monitoring_subscription: {get_attr: [GlanceApiBase, role_data, monitoring_subscription]}
+ logging_source: {get_attr: [GlanceApiBase, role_data, logging_source]}
+ logging_groups: {get_attr: [GlanceApiBase, role_data, logging_groups]}
config_settings:
map_merge:
- get_attr: [GlanceApiBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [GlanceApiBase, role_data, config_settings]