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 "Create network-isolation-no-tunneling.yaml using jinja2" into stable/pike
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
ceph-ansible
/
ceph-osd.yaml
diff --git
a/docker/services/ceph-ansible/ceph-osd.yaml
b/docker/services/ceph-ansible/ceph-osd.yaml
index
6e0f4a6
..
fe7d311
100644
(file)
--- a/
docker/services/ceph-ansible/ceph-osd.yaml
+++ b/
docker/services/ceph-ansible/ceph-osd.yaml
@@
-38,6
+38,7
@@
parameters:
- /dev/vdb
journal_size: 512
journal_collocation: true
- /dev/vdb
journal_size: 512
journal_collocation: true
+ osd_scenario: collocated
resources:
CephBase:
resources:
CephBase:
@@
-72,4
+73,5
@@
outputs:
- ceph_osd_ansible_vars:
map_merge:
- {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
- ceph_osd_ansible_vars:
map_merge:
- {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
+ - osd_objectstore: filestore
- {get_param: CephAnsibleDisksConfig}
\ No newline at end of file
- {get_param: CephAnsibleDisksConfig}
\ No newline at end of file