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 "Add sahara service support for composable upgrades"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
ceph-mon.yaml
diff --git
a/puppet/services/ceph-mon.yaml
b/puppet/services/ceph-mon.yaml
index
552086a
..
68ad69b
100644
(file)
--- a/
puppet/services/ceph-mon.yaml
+++ b/
puppet/services/ceph-mon.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-04-08
+heat_template_version:
ocata
description: >
Ceph Monitor service.
description: >
Ceph Monitor service.
@@
-28,6
+28,12
@@
parameters:
CinderRbdPoolName:
default: volumes
type: string
CinderRbdPoolName:
default: volumes
type: string
+ ManilaCephFSDataPoolName:
+ default: manila_data
+ type: string
+ ManilaCephFSMetadataPoolName:
+ default: manila_metadata
+ type: string
CinderBackupRbdPoolName:
default: backups
type: string
CinderBackupRbdPoolName:
default: backups
type: string
@@
-87,6
+93,8
@@
outputs:
for_each:
<%pool%>:
- {get_param: CinderRbdPoolName}
for_each:
<%pool%>:
- {get_param: CinderRbdPoolName}
+ - {get_param: ManilaCephFSDataPoolName}
+ - {get_param: ManilaCephFSMetadataPoolName}
- {get_param: CinderBackupRbdPoolName}
- {get_param: NovaRbdPoolName}
- {get_param: GlanceRbdPoolName}
- {get_param: CinderBackupRbdPoolName}
- {get_param: NovaRbdPoolName}
- {get_param: GlanceRbdPoolName}
@@
-101,5
+109,7
@@
outputs:
'110 ceph_mon':
dport:
- 6789
'110 ceph_mon':
dport:
- 6789
+ service_config_settings:
+ get_attr: [CephBase, role_data, service_config_settings]
step_config: |
include ::tripleo::profile::base::ceph::mon
step_config: |
include ::tripleo::profile::base::ceph::mon