From e098f34a35871544ba6758352c99dd1207a79704 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 27 Sep 2017 16:42:53 +0200 Subject: [PATCH] Fix use of CephAnsibleExtraConfig and CephConfigOverrides Uses better (shorter) examples to distinguish better which one is to be used for what. Change-Id: I51341fb3aa72106e48241a97c89bb3a7bc1d6fb8 Depends-On: I145feb0208f135da7c71694ebcecd937244d66b1 Related-Bug: #1719919 --- .../advanced_deployment/ceph_config.rst | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/doc/source/install/advanced_deployment/ceph_config.rst b/doc/source/install/advanced_deployment/ceph_config.rst index a1df7ff0..dda9db4d 100644 --- a/doc/source/install/advanced_deployment/ceph_config.rst +++ b/doc/source/install/advanced_deployment/ceph_config.rst @@ -126,19 +126,7 @@ by the TripleO Pike release to drive `puppet-ceph` continue to work and are translated, when possible, into their equivalent `ceph-ansible` variable. -Global settings in the `ceph.conf` may be set using -`ceph_conf_overrides` like the following:: - - CephAnsibleExtraConfig: - ceph_conf_overrides: - global: - journal_size: 2048 - max_open_files: 131072 - osd_pool_default_size: 3 - osd_pool_default_pg_num: 256 - -`CephAnsibleExtraConfig` isn't just for `ceph.conf` overrides. For -example, to encrypt the data stored on OSDs use the following:: +For example, to encrypt the data stored on OSDs use the following:: CephAnsibleExtraConfig: dmcrypt: true @@ -146,6 +134,12 @@ example, to encrypt the data stored on OSDs use the following:: The above overrides the defaults found in the `ceph-ansible/group_vars`_. +Global settings in the `ceph.conf` may be set using +`CephConfigOverrides` like the following:: + + CephConfigOverrides: + max_open_files: 131072 + To specify a set of dedicated block devices to use as Ceph OSDs use a variation of the following::