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 "Cleanup haproxy service from explicit services enablement"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
heat-engine.yaml
diff --git
a/puppet/services/heat-engine.yaml
b/puppet/services/heat-engine.yaml
index
1b4f8e7
..
089bf53
100644
(file)
--- a/
puppet/services/heat-engine.yaml
+++ b/
puppet/services/heat-engine.yaml
@@
-40,6
+40,9
@@
parameters:
type: string
hidden: true
default: ''
type: string
hidden: true
default: ''
+ MonitoringSubscriptionHeatEngine:
+ default: 'overcloud-heat-engine'
+ type: string
resources:
HeatBase:
resources:
HeatBase:
@@
-54,6
+57,7
@@
outputs:
description: Role data for the Heat Engine role.
value:
service_name: heat_engine
description: Role data for the Heat Engine role.
value:
service_name: heat_engine
+ monitoring_subscription: {get_param: MonitoringSubscriptionHeatEngine}
config_settings:
map_merge:
- get_attr: [HeatBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [HeatBase, role_data, config_settings]