From 5e25b19cc7bd5845eccdd0bbb3d6ee8a5852563d Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 13 Sep 2021 17:12:01 +0200 Subject: [PATCH 1/2] doc/cephadm: move service-management to services/index.rst Signed-off-by: Sebastian Wagner --- doc/cephadm/index.rst | 2 +- doc/cephadm/{service-management.rst => services/index.rst} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename doc/cephadm/{service-management.rst => services/index.rst} (100%) diff --git a/doc/cephadm/index.rst b/doc/cephadm/index.rst index 5fe28ba728d..373262d8006 100644 --- a/doc/cephadm/index.rst +++ b/doc/cephadm/index.rst @@ -36,7 +36,7 @@ versions of Ceph. iscsi custom-container monitoring - service-management + Service Management upgrade Cephadm operations Client Setup diff --git a/doc/cephadm/service-management.rst b/doc/cephadm/services/index.rst similarity index 100% rename from doc/cephadm/service-management.rst rename to doc/cephadm/services/index.rst From 8c70398949f773d8b992ad8ae6c71383460d2932 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 13 Sep 2021 17:15:33 +0200 Subject: [PATCH 2/2] doc/cephadm: move services into services/ This is going to clean up the toctree a bit. Signed-off-by: Sebastian Wagner --- doc/cephadm/index.rst | 11 +---------- .../{ => services}/custom-container.rst | 0 doc/cephadm/services/index.rst | 19 ++++++++++++++++++- doc/cephadm/{ => services}/iscsi.rst | 0 doc/cephadm/{ => services}/mds.rst | 0 doc/cephadm/{ => services}/mgr.rst | 0 doc/cephadm/{ => services}/mon.rst | 0 doc/cephadm/{ => services}/monitoring.rst | 0 doc/cephadm/{ => services}/nfs.rst | 0 doc/cephadm/{ => services}/osd.rst | 0 doc/cephadm/{ => services}/rgw.rst | 2 +- 11 files changed, 20 insertions(+), 12 deletions(-) rename doc/cephadm/{ => services}/custom-container.rst (100%) rename doc/cephadm/{ => services}/iscsi.rst (100%) rename doc/cephadm/{ => services}/mds.rst (100%) rename doc/cephadm/{ => services}/mgr.rst (100%) rename doc/cephadm/{ => services}/mon.rst (100%) rename doc/cephadm/{ => services}/monitoring.rst (100%) rename doc/cephadm/{ => services}/nfs.rst (100%) rename doc/cephadm/{ => services}/osd.rst (100%) rename doc/cephadm/{ => services}/rgw.rst (99%) diff --git a/doc/cephadm/index.rst b/doc/cephadm/index.rst index 373262d8006..d57fe288a01 100644 --- a/doc/cephadm/index.rst +++ b/doc/cephadm/index.rst @@ -21,21 +21,12 @@ either via the Ceph command-line interface (CLI) or via the dashboard (GUI). versions of Ceph. .. toctree:: - :maxdepth: 1 + :maxdepth: 2 compatibility install adoption host-management - mon - mgr - osd - rgw - mds - nfs - iscsi - custom-container - monitoring Service Management upgrade Cephadm operations diff --git a/doc/cephadm/custom-container.rst b/doc/cephadm/services/custom-container.rst similarity index 100% rename from doc/cephadm/custom-container.rst rename to doc/cephadm/services/custom-container.rst diff --git a/doc/cephadm/services/index.rst b/doc/cephadm/services/index.rst index 6d382b6ec7b..3fb7bddf511 100644 --- a/doc/cephadm/services/index.rst +++ b/doc/cephadm/services/index.rst @@ -2,10 +2,27 @@ Service Management ================== +A service is a group of daemons configured together. See these chapters +for details on individual services: + +.. toctree:: + :maxdepth: 1 + + mon + mgr + osd + rgw + mds + nfs + iscsi + custom-container + monitoring + Service Status ============== -A service is a group of daemons configured together. To see the status of one + +To see the status of one of the services running in the Ceph cluster, do the following: #. Use the command line to print a list of services. diff --git a/doc/cephadm/iscsi.rst b/doc/cephadm/services/iscsi.rst similarity index 100% rename from doc/cephadm/iscsi.rst rename to doc/cephadm/services/iscsi.rst diff --git a/doc/cephadm/mds.rst b/doc/cephadm/services/mds.rst similarity index 100% rename from doc/cephadm/mds.rst rename to doc/cephadm/services/mds.rst diff --git a/doc/cephadm/mgr.rst b/doc/cephadm/services/mgr.rst similarity index 100% rename from doc/cephadm/mgr.rst rename to doc/cephadm/services/mgr.rst diff --git a/doc/cephadm/mon.rst b/doc/cephadm/services/mon.rst similarity index 100% rename from doc/cephadm/mon.rst rename to doc/cephadm/services/mon.rst diff --git a/doc/cephadm/monitoring.rst b/doc/cephadm/services/monitoring.rst similarity index 100% rename from doc/cephadm/monitoring.rst rename to doc/cephadm/services/monitoring.rst diff --git a/doc/cephadm/nfs.rst b/doc/cephadm/services/nfs.rst similarity index 100% rename from doc/cephadm/nfs.rst rename to doc/cephadm/services/nfs.rst diff --git a/doc/cephadm/osd.rst b/doc/cephadm/services/osd.rst similarity index 100% rename from doc/cephadm/osd.rst rename to doc/cephadm/services/osd.rst diff --git a/doc/cephadm/rgw.rst b/doc/cephadm/services/rgw.rst similarity index 99% rename from doc/cephadm/rgw.rst rename to doc/cephadm/services/rgw.rst index f7bc72e1312..2914042cc37 100644 --- a/doc/cephadm/rgw.rst +++ b/doc/cephadm/services/rgw.rst @@ -155,7 +155,7 @@ balancing on a floating virtual IP. If SSL is used, then SSL must be configured and terminated by the ingress service and not RGW itself. -.. image:: ../images/HAProxy_for_RGW.svg +.. image:: ../../images/HAProxy_for_RGW.svg There are N hosts where the ingress service is deployed. Each host has a haproxy daemon and a keepalived daemon. A virtual IP is