aboutsummaryrefslogtreecommitdiffstats
path: root/ci
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 /ci
parent68c2dbca26d24294b8ad94cf55cebd3f3b78bbb1 (diff)
parent643c4148ee10c51a49b95103f680d574fd5b139b (diff)
Merge "Add CephConfigOverrides to allow arbitrary configs in ceph.conf" into stable/pike
Diffstat (limited to 'ci')
-rw-r--r--ci/environments/scenario001-multinode-containers.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 79d5a280..e061c0a5 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -106,6 +106,7 @@ parameter_defaults:
- /dev/loop3
journal_size: 512
journal_collocation: true
+ osd_scenario: collocated
CephAnsibleExtraConfig:
ceph_conf_overrides:
global: