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
/
neutron-midonet.yaml
diff --git
a/puppet/services/pacemaker/neutron-midonet.yaml
b/puppet/services/pacemaker/neutron-midonet.yaml
index
fb39ea4
..
fdd5daf
100644
(file)
--- a/
puppet/services/pacemaker/neutron-midonet.yaml
+++ b/
puppet/services/pacemaker/neutron-midonet.yaml
@@
-33,6
+33,7
@@
outputs:
description: Role data for the Neutron Midonet plugin.
value:
service_name: neutron_midonet
description: Role data for the Neutron Midonet plugin.
value:
service_name: neutron_midonet
+ monitoring_subscription: {get_attr: [NeutronMidonetBase, role_data, monitoring_subscription]}
config_settings:
map_merge:
- get_attr: [NeutronMidonetBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [NeutronMidonetBase, role_data, config_settings]