aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/ceph-ansible/ceph-osd.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-13 21:26:58 +0000
committerGerrit Code Review <review@openstack.org>2017-09-13 21:26:58 +0000
commit727e3b4caf4d7ec8f472063e0b0a66a5a57dab19 (patch)
treeaafe9bdb9d652cd424b187f0068745c27ee5eaf1 /docker/services/ceph-ansible/ceph-osd.yaml
parent68c2dbca26d24294b8ad94cf55cebd3f3b78bbb1 (diff)
parent643c4148ee10c51a49b95103f680d574fd5b139b (diff)
Merge "Add CephConfigOverrides to allow arbitrary configs in ceph.conf" into stable/pike
Diffstat (limited to 'docker/services/ceph-ansible/ceph-osd.yaml')
-rw-r--r--docker/services/ceph-ansible/ceph-osd.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/services/ceph-ansible/ceph-osd.yaml b/docker/services/ceph-ansible/ceph-osd.yaml
index 6e0f4a60..fe7d311d 100644
--- 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
+ osd_scenario: collocated
resources:
CephBase:
@@ -72,4 +73,5 @@ outputs:
- 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