@@ -94,27 +94,26 @@ entirely.
9494Skipping monitor config
9595-----------------------
9696
97- Pass the option ``--no-mon-config `` to any process to skip the step that
98- retrieves configuration information from the cluster monitors. This is useful
99- in cases where configuration is managed entirely via configuration files, or
100- when the monitor cluster is down and some maintenance activity needs to be
101- done.
102-
97+ The option ``--no-mon-config `` can be passed in any command in order to skip
98+ the step that retrieves configuration information from the cluster's monitors.
99+ Skipping this retrieval step can be useful in cases where configuration is
100+ managed entirely via configuration files, or when maintenance activity needs to
101+ be done but the monitor cluster is down.
103102
104103.. _ceph-conf-file :
105104
106-
107105Configuration sections
108106======================
109107
110- Any given process or daemon has a single value for each configuration
111- option. However, values for an option may vary across different
112- daemon types even daemons of the same type. Ceph options that are
113- stored in the monitor configuration database or in local configuration
114- files are grouped into sections to indicate which daemons or clients
115- they apply to.
108+ Each of the configuration options associated with a single process or daemon
109+ has a single value. However, the values for a configuration option can vary
110+ across daemon types, and can vary even across different daemons of the same
111+ type. Ceph options that are stored in the monitor configuration database or in
112+ local configuration files are grouped into sections |--- | so-called "configuration
113+ sections" |--- | to indicate which daemons or clients they apply to.
114+
116115
117- These sections include:
116+ These sections include the following :
118117
119118.. confsec :: global
120119
@@ -157,41 +156,40 @@ These sections include:
157156
158157.. confsec :: client
159158
160- Settings under ``client `` affect all Ceph Clients
161- (e.g. , mounted Ceph File Systems, mounted Ceph Block Devices,
162- etc.) as well as Rados Gateway (RGW) daemons.
159+ Settings under ``client `` affect all Ceph clients
160+ (for example , mounted Ceph File Systems, mounted Ceph Block Devices)
161+ as well as RADOS Gateway (RGW) daemons.
163162
164163 :example: ``objecter_inflight_ops = 512 ``
165164
166165
167- Sections may also specify an individual daemon or client name. For example,
166+ Configuration sections can also specify an individual daemon or client name. For example,
168167``mon.foo ``, ``osd.123 ``, and ``client.smith `` are all valid section names.
169168
170169
171- Any given daemon will draw its settings from the global section, the
172- daemon or client type section, and the section sharing its name.
173- Settings in the most-specific section take precedence, so for example
174- if the same option is specified in both :confsec: `global `, :confsec: `mon `, and
175- `` mon.foo `` on the same source (i.e., in the same configurationfile),
176- the ``mon.foo `` value will be used.
170+ Any given daemon will draw its settings from the global section, the daemon- or
171+ client- type section, and the section sharing its name. Settings in the
172+ most-specific section take precedence so precedence: for example, if the same
173+ option is specified in both :confsec: `global `, :confsec: `mon `, and `` mon.foo ``
174+ on the same source (i.e. that is , in the same configuration file), the
175+ ``mon.foo `` setting will be used.
177176
178177If multiple values of the same configuration option are specified in the same
179- section, the last value wins.
180-
181- Note that values from the local configuration file always take
182- precedence over values from the monitor configuration database,
183- regardless of which section they appear in.
178+ section, the last value specified takes precedence.
184179
180+ Note that values from the local configuration file always take precedence over
181+ values from the monitor configuration database, regardless of the section in
182+ which they appear.
185183
186184.. _ceph-metavariables :
187185
188186Metavariables
189187=============
190188
191- Metavariables simplify Ceph Storage Cluster configuration
192- dramatically. When a metavariable is set in a configuration value,
193- Ceph expands the metavariable into a concrete value at the time the
194- configuration value is used. Ceph metavariables are similar to variable expansion in the Bash shell.
189+ Metavariables dramatically simplify Ceph storage cluster configuration. When a
190+ metavariable is set in a configuration value, Ceph expands the metavariable at
191+ the time the configuration value is used. In this way, Ceph metavariables
192+ behave similarly to the way that variable expansion works in the Bash shell.
195193
196194Ceph supports the following metavariables:
197195
@@ -205,7 +203,7 @@ Ceph supports the following metavariables:
205203
206204.. describe :: $type
207205
208- Expands to a daemon or process type (e.g. , ``mds ``, ``osd ``, or ``mon ``)
206+ Expands to a daemon or process type (for example , ``mds ``, ``osd ``, or ``mon ``)
209207
210208 :example: ``/var/lib/ceph/$type ``
211209
@@ -234,33 +232,32 @@ Ceph supports the following metavariables:
234232 :example: ``/var/run/ceph/$cluster-$name-$pid.asok ``
235233
236234
237-
238- The Configuration File
239- ======================
235+ Ceph configuration file
236+ =======================
240237
241238On startup, Ceph processes search for a configuration file in the
242239following locations:
243240
244- #. ``$CEPH_CONF `` (* i.e., * the path following the ``$CEPH_CONF ``
241+ #. ``$CEPH_CONF `` (that is, the path following the ``$CEPH_CONF ``
245242 environment variable)
246- #. ``-c path/path `` (* i.e., * the ``-c `` command line argument)
243+ #. ``-c path/path `` (that is, the ``-c `` command line argument)
247244#. ``/etc/ceph/$cluster.conf ``
248245#. ``~/.ceph/$cluster.conf ``
249- #. ``./$cluster.conf `` (* i.e., * in the current working directory)
246+ #. ``./$cluster.conf `` (that is, in the current working directory)
250247#. On FreeBSD systems only, ``/usr/local/etc/ceph/$cluster.conf ``
251248
252- where ``$cluster `` is the cluster's name (default ``ceph ``).
249+ Here ``$cluster `` is the cluster's name (default: ``ceph ``).
253250
254- The Ceph configuration file uses an * ini * style syntax. You can add comment
255- text after a pound sign (#) or a semi-colon (;). For example:
251+ The Ceph configuration file uses an `` ini `` style syntax. You can add " comment
252+ text" after a pound sign (#) or a semi-colon semicolon (;). For example:
256253
257254.. code-block :: ini
258255
259- # <--A number (#) sign precedes a comment.
260- ; A comment may be anything.
261- # Comments always follow a semi-colon (;) or a pound (#) on each line.
262- # The end of the line terminates a comment.
263- # We recommend that you provide comments in your configuration file(s).
256+ # <--A number (#) sign number sign (#) precedes a comment.
257+ ; A comment may be anything.
258+ # Comments always follow a semi-colon semicolon (;) or a pound sign (#) on each line.
259+ # The end of the line terminates a comment.
260+ # We recommend that you provide comments in your configuration file(s).
264261
265262
266263 .. _ceph-conf-settings :
@@ -269,23 +266,22 @@ Config file section names
269266-------------------------
270267
271268The configuration file is divided into sections. Each section must begin with a
272- valid configuration section name (see `Configuration sections `_, above)
273- surrounded by square brackets. For example,
269+ valid configuration section name (see `Configuration sections `_, above) that is
270+ surrounded by square brackets. For example:
274271
275272.. code-block :: ini
276273
277- [global]
278- debug_ms = 0
279-
280- [osd]
281- debug_ms = 1
282-
283- [osd.1]
284- debug_ms = 10
274+ [global]
275+ debug_ms = 0
276+
277+ [osd]
278+ debug_ms = 1
285279
286- [osd.2 ]
287- debug_ms = 10
280+ [osd.1 ]
281+ debug_ms = 10
288282
283+ [osd.2]
284+ debug_ms = 10
289285
290286 Config file option values
291287-------------------------
@@ -702,3 +698,6 @@ These changes are as follows:
702698 all options would be set as though they were within the :confsec: `global ` section. This is
703699 now discouraged. Since Octopus, only a single option is allowed for
704700 configuration files without a section name.
701+
702+ .. |--- | unicode :: U+2014 .. EM DASH
703+ :trim:
0 commit comments