From 643c4148ee10c51a49b95103f680d574fd5b139b Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 6 Sep 2017 09:39:12 +0200 Subject: Add CephConfigOverrides to allow arbitrary configs in ceph.conf We need to reuse the ceph_conf_overrides structure provided by ceph-ansible for both user provided configs and TripleO managed configs. This change merges the special user facing parameter with the TripleO generated configs. Also adds osd_scenario and osd_objectstore params for compatibility with newer ceph-ansible versions. Change-Id: I29c689c6c689590da5b6a3f581fdbec98a52e207 Closes-Bug: #1715321 (cherry picked from commit 32bc2abf14af4ca1449e18b848e2be3cff013987) --- ci/environments/scenario001-multinode-containers.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'ci') 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: -- cgit 1.2.3-korg