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 "We don't need to set a default for the CephX keys and cluster FSID"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
pacemaker
/
neutron-plugin-opencontrail.yaml
diff --git
a/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml
b/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml
index
d8c7550
..
1d385d8
100644
(file)
--- a/
puppet/services/pacemaker/neutron-plugin-opencontrail.yaml
+++ b/
puppet/services/pacemaker/neutron-plugin-opencontrail.yaml
@@
-21,6
+21,7
@@
outputs:
role_data:
description: Role data for the Neutron OpenContrail plugin.
value:
+ service_name: neutron_plugin_opencontrail
config_settings:
map_merge:
- get_attr: [NeutronPluginOpenContrail, role_data, config_settings]