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 "Fix a typo"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
pacemaker
/
cinder-backup.yaml
diff --git
a/puppet/services/pacemaker/cinder-backup.yaml
b/puppet/services/pacemaker/cinder-backup.yaml
index
7e940c7
..
e75ac97
100644
(file)
--- a/
puppet/services/pacemaker/cinder-backup.yaml
+++ b/
puppet/services/pacemaker/cinder-backup.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-04-08
+heat_template_version:
ocata
description: >
OpenStack Cinder Backup service with Pacemaker configured with Puppet
description: >
OpenStack Cinder Backup service with Pacemaker configured with Puppet
@@
-48,6
+48,7
@@
outputs:
description: Role data for the Cinder Backup role.
value:
service_name: cinder_backup
description: Role data for the Cinder Backup role.
value:
service_name: cinder_backup
+ monitoring_subscription: {get_attr: [CinderBackupBase, role_data, monitoring_subscription]}
config_settings:
map_merge:
- get_attr: [CinderBackupBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [CinderBackupBase, role_data, config_settings]