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
Add retry to RHEL registration
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
pacemaker
/
heat-api.yaml
diff --git
a/puppet/services/pacemaker/heat-api.yaml
b/puppet/services/pacemaker/heat-api.yaml
index
4a54e81
..
43122cb
100644
(file)
--- a/
puppet/services/pacemaker/heat-api.yaml
+++ b/
puppet/services/pacemaker/heat-api.yaml
@@
-10,6
+10,9
@@
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-21,6
+24,7
@@
resources:
type: ../heat-api.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
type: ../heat-api.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs:
EndpointMap: {get_param: EndpointMap}
outputs:
@@
-28,6
+32,9
@@
outputs:
description: Role data for the Heat API role.
value:
service_name: heat_api
description: Role data for the Heat API role.
value:
service_name: heat_api
+ monitoring_subscription: {get_attr: [HeatApiBase, role_data, monitoring_subscription]}
+ logging_source: {get_attr: [HeatApiBase, role_data, logging_source]}
+ logging_groups: {get_attr: [HeatApiBase, role_data, logging_groups]}
config_settings:
map_merge:
- get_attr: [HeatApiBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [HeatApiBase, role_data, config_settings]