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) --- docker/services/ceph-ansible/ceph-osd.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to '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 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 -- cgit 1.2.3-korg