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 "Upgrades: fix up the rabbitmq HA mode like in new ocata deployments"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
pacemaker
/
manila-share.yaml
diff --git
a/puppet/services/pacemaker/manila-share.yaml
b/puppet/services/pacemaker/manila-share.yaml
index
7479eb0
..
ddc13df
100644
(file)
--- a/
puppet/services/pacemaker/manila-share.yaml
+++ b/
puppet/services/pacemaker/manila-share.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-04-08
+heat_template_version:
ocata
description: >
The manila-share service with Pacemaker configured with Puppet
description: >
The manila-share service with Pacemaker configured with Puppet
@@
-33,6
+33,7
@@
outputs:
description: Role data for the manila-share pacemaker role.
value:
service_name: manila_share
description: Role data for the manila-share pacemaker role.
value:
service_name: manila_share
+ monitoring_subscription: {get_attr: [ManilaShareBase, role_data, monitoring_subscription]}
config_settings:
map_merge:
- get_attr: [ManilaShareBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [ManilaShareBase, role_data, config_settings]