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 "Make Nova VNC Proxy service name match service net map"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
pacemaker
/
haproxy.yaml
diff --git
a/puppet/services/pacemaker/haproxy.yaml
b/puppet/services/pacemaker/haproxy.yaml
index
de02833
..
52104a7
100644
(file)
--- a/
puppet/services/pacemaker/haproxy.yaml
+++ b/
puppet/services/pacemaker/haproxy.yaml
@@
-32,6
+32,7
@@
outputs:
description: Role data for the HAproxy with pacemaker role.
value:
service_name: haproxy
description: Role data for the HAproxy with pacemaker role.
value:
service_name: haproxy
+ monitoring_subscription: {get_attr: [LoadbalancerServiceBase, role_data, monitoring_subscription]}
config_settings:
map_merge:
- get_attr: [LoadbalancerServiceBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [LoadbalancerServiceBase, role_data, config_settings]