Skip to content

Commit 25e7e77

Browse files
authored
Merge pull request ceph#62687 from anthonyeleven/acronym
doc/cephadm/services: improve rgw.rst and snmp-gateway.rst Reviewed-by: Zac Dover <[email protected]>
2 parents e0958b5 + 3d18222 commit 25e7e77

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

doc/cephadm/services/rgw.rst

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ RGW Service
77
Deploy RGWs
88
===========
99

10-
Cephadm deploys radosgw as a collection of daemons that manage a
10+
Cephadm deploys the Object Gateway (RGW) as a collection of daemons that manage a
1111
single-cluster deployment or a particular *realm* and *zone* in a
1212
multisite deployment. (For more information about realms and zones,
1313
see :ref:`multisite`.)
1414

15-
Note that with cephadm, radosgw daemons are configured via the monitor
15+
Note that with ``cephadm``, ``radosgw`` daemons are configured via the monitor
1616
configuration database instead of via a `ceph.conf` or the command line. If
1717
that configuration isn't already in place (usually in the
18-
``client.rgw.<something>`` section), then the radosgw
18+
``client.rgw.<something>`` section), then the ``radosgw``
1919
daemons will start up with default settings (e.g., binding to port
2020
80).
2121

22-
To deploy a set of radosgw daemons, with an arbitrary service name
22+
To deploy a set of ``radosgw`` daemons, with an arbitrary service name
2323
*name*, run the following command:
2424

2525
.. prompt:: bash #
@@ -29,8 +29,8 @@ To deploy a set of radosgw daemons, with an arbitrary service name
2929
Trivial setup
3030
-------------
3131

32-
For example, to deploy 2 RGW daemons (the default) for a single-cluster RGW deployment
33-
under the arbitrary service id *foo*:
32+
For example, to deploy two daemons (the default) for a single-cluster RGW deployment
33+
with the arbitrary service id ``foo``:
3434

3535
.. prompt:: bash #
3636

@@ -58,7 +58,7 @@ See also: :ref:`cephadm_co_location`.
5858
Specifying Networks
5959
-------------------
6060

61-
The RGW service can have the network they bind to configured with a yaml service specification.
61+
The RGW service can have the network they bind to configured with a YAML service specification.
6262

6363
example spec file:
6464

@@ -77,8 +77,8 @@ example spec file:
7777
Passing Frontend Extra Arguments
7878
--------------------------------
7979

80-
The RGW service specification can be used to pass extra arguments to the rgw frontend by using
81-
the `rgw_frontend_extra_args` arguments list.
80+
The RGW service specification can be used to pass extra arguments to the frontend by using
81+
the ``rgw_frontend_extra_args`` arguments list.
8282

8383
example spec file:
8484

@@ -98,23 +98,23 @@ example spec file:
9898
- "tcp_nodelay=1"
9999
- "max_header_size=65536"
100100
101-
.. note:: cephadm combines the arguments from the `spec` section and the ones from
102-
the `rgw_frontend_extra_args` into a single space-separated arguments list
103-
which is used to set the value of `rgw_frontends` configuration parameter.
101+
.. note:: ``cephadm`` combines the arguments from the ``spec`` section with those from
102+
``rgw_frontend_extra_args`` into a single space-separated arguments list
103+
which is used to set the value of the ``rgw_frontends`` configuration parameter.
104104

105105
Multisite zones
106106
---------------
107107

108-
To deploy RGWs serving the multisite *myorg* realm and the *us-east-1* zone on
109-
*myhost1* and *myhost2*:
108+
To deploy RGWs serving the multisite ``myorg`` realm and the ``us-east-1`` zone on
109+
``myhost1`` and ``myhost2``:
110110

111111
.. prompt:: bash #
112112

113113
ceph orch apply rgw east --realm=myorg --zonegroup=us-east-zg-1 --zone=us-east-1 --placement="2 myhost1 myhost2"
114114

115-
Note that in a multisite situation, cephadm only deploys the daemons. It does not create
116-
or update the realm or zone configurations. To create a new realms, zones and zonegroups
117-
you can use :ref:`mgr-rgw-module` or manually using something like:
115+
Note that in a multisite situation, ``cephadm`` only deploys the daemons. It does not create
116+
or update the realm or zone configurations. To create a new realm, zone, and zonegroup
117+
use :ref:`mgr-rgw-module` or issue commands of the following form:
118118

119119
.. prompt:: bash #
120120

@@ -283,7 +283,7 @@ Use the command::
283283
Service specification
284284
---------------------
285285

286-
It is a yaml format file with the following properties:
286+
Service specs are YAML blocks with the following properties:
287287

288288
.. code-block:: yaml
289289
@@ -385,12 +385,12 @@ where the properties of this service specification are:
385385

386386
.. _ingress-virtual-ip:
387387

388-
Selecting ethernet interfaces for the virtual IP
388+
Selecting network interfaces for the virtual IP
389389
------------------------------------------------
390390

391391
You cannot simply provide the name of the network interface on which
392-
to configure the virtual IP because interface names tend to vary
393-
across hosts (and/or reboots). Instead, cephadm will select
392+
to configure the virtual IP because interface names may vary
393+
across hosts (and/or reboots). Instead, ``cephadm`` will select
394394
interfaces based on other existing IP addresses that are already
395395
configured.
396396

@@ -422,8 +422,8 @@ and reference that dummy network in the networks list (see above).
422422
Useful hints for ingress
423423
------------------------
424424

425-
* It is good to have at least 3 RGW daemons.
426-
* We recommend at least 3 hosts for the ingress service.
425+
* It is advised to have at least three ``radosgw`` daemons for availability and load balancing.
426+
* We recommend at least three hosts for the ``ingress`` service.
427427

428428
Further Reading
429429
===============

0 commit comments

Comments
 (0)