From d231eb90cee6ee983594643451061f625f107c26 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Fri, 13 Mar 2020 15:15:29 +0100 Subject: [PATCH] doc: Move ceph-deploy docs to doc/install/ceph-deploy Signed-off-by: Sebastian Wagner --- doc/index.rst | 1 - doc/{start => install/ceph-deploy}/index.rst | 9 ++++++++- .../{ => ceph-deploy}/install-ceph-gateway.rst | 0 .../ceph-deploy}/quick-ceph-deploy.rst | 0 .../ceph-deploy}/quick-cephfs.rst | 0 .../ceph-deploy}/quick-common.rst | 0 .../ceph-deploy}/quick-rgw-old.rst | 0 doc/{start => install/ceph-deploy}/quick-rgw.rst | 0 .../ceph-deploy}/quick-start-preflight.rst | 0 doc/install/{ => ceph-deploy}/upgrading-ceph.rst | 0 doc/install/index.rst | 16 ++++++++++------ doc/install/index_manual.rst | 3 --- doc/radosgw/index.rst | 2 +- 13 files changed, 19 insertions(+), 12 deletions(-) rename doc/{start => install/ceph-deploy}/index.rst (87%) rename doc/install/{ => ceph-deploy}/install-ceph-gateway.rst (100%) rename doc/{start => install/ceph-deploy}/quick-ceph-deploy.rst (100%) rename doc/{start => install/ceph-deploy}/quick-cephfs.rst (100%) rename doc/{start => install/ceph-deploy}/quick-common.rst (100%) rename doc/{start => install/ceph-deploy}/quick-rgw-old.rst (100%) rename doc/{start => install/ceph-deploy}/quick-rgw.rst (100%) rename doc/{start => install/ceph-deploy}/quick-start-preflight.rst (100%) rename doc/install/{ => ceph-deploy}/upgrading-ceph.rst (100%) diff --git a/doc/index.rst b/doc/index.rst index 0306df6eaf1df..af3b49c6c33cf 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -93,7 +93,6 @@ about Ceph, see our `Architecture`_ section. start/intro cephadm/index - start/index install/index rados/index cephfs/index diff --git a/doc/start/index.rst b/doc/install/ceph-deploy/index.rst similarity index 87% rename from doc/start/index.rst rename to doc/install/ceph-deploy/index.rst index 40143214dfb08..9579d3b3be8e5 100644 --- a/doc/start/index.rst +++ b/doc/install/ceph-deploy/index.rst @@ -38,7 +38,7 @@ Ceph Block Devices, the Ceph File System, and Ceph Object Storage. .. toctree:: - Block Device Quick Start + Block Device Quick Start <../../start/quick-rbd> Filesystem Quick Start Object Storage Quick Start @@ -47,3 +47,10 @@ Ceph Block Devices, the Ceph File System, and Ceph Object Storage. +.. toctree:: + :hidden: + + Upgrading Ceph + Install Ceph Object Gateway + + diff --git a/doc/install/install-ceph-gateway.rst b/doc/install/ceph-deploy/install-ceph-gateway.rst similarity index 100% rename from doc/install/install-ceph-gateway.rst rename to doc/install/ceph-deploy/install-ceph-gateway.rst diff --git a/doc/start/quick-ceph-deploy.rst b/doc/install/ceph-deploy/quick-ceph-deploy.rst similarity index 100% rename from doc/start/quick-ceph-deploy.rst rename to doc/install/ceph-deploy/quick-ceph-deploy.rst diff --git a/doc/start/quick-cephfs.rst b/doc/install/ceph-deploy/quick-cephfs.rst similarity index 100% rename from doc/start/quick-cephfs.rst rename to doc/install/ceph-deploy/quick-cephfs.rst diff --git a/doc/start/quick-common.rst b/doc/install/ceph-deploy/quick-common.rst similarity index 100% rename from doc/start/quick-common.rst rename to doc/install/ceph-deploy/quick-common.rst diff --git a/doc/start/quick-rgw-old.rst b/doc/install/ceph-deploy/quick-rgw-old.rst similarity index 100% rename from doc/start/quick-rgw-old.rst rename to doc/install/ceph-deploy/quick-rgw-old.rst diff --git a/doc/start/quick-rgw.rst b/doc/install/ceph-deploy/quick-rgw.rst similarity index 100% rename from doc/start/quick-rgw.rst rename to doc/install/ceph-deploy/quick-rgw.rst diff --git a/doc/start/quick-start-preflight.rst b/doc/install/ceph-deploy/quick-start-preflight.rst similarity index 100% rename from doc/start/quick-start-preflight.rst rename to doc/install/ceph-deploy/quick-start-preflight.rst diff --git a/doc/install/upgrading-ceph.rst b/doc/install/ceph-deploy/upgrading-ceph.rst similarity index 100% rename from doc/install/upgrading-ceph.rst rename to doc/install/ceph-deploy/upgrading-ceph.rst diff --git a/doc/install/index.rst b/doc/install/index.rst index 298b3b39a75e1..69a48a6d003c1 100644 --- a/doc/install/index.rst +++ b/doc/install/index.rst @@ -69,6 +69,11 @@ Install ceph using ceph-deploy ceph-deploy is no longer actively maintained. It is not tested on versions of Ceph newer than Nautilus. It does not support RHEL8, CentOS 8, or newer operating systems. +.. toctree:: + :hidden: + + ceph-deploy/index + DeepSea ------- @@ -92,6 +97,11 @@ Manually install Ceph using packages. * :ref:`install-manual` +.. toctree:: + :hidden: + + index_manual + Puppet ------ @@ -100,9 +110,3 @@ Installs Ceph using Puppet * `github.com/openstack/puppet-ceph `_ - - -.. toctree:: - :hidden: - - index_manual diff --git a/doc/install/index_manual.rst b/doc/install/index_manual.rst index 68520735ac670..817247c9532b3 100644 --- a/doc/install/index_manual.rst +++ b/doc/install/index_manual.rst @@ -42,7 +42,6 @@ QEMU. Install ceph-deploy Install Ceph Storage Cluster - Install Ceph Object Gateway Install Virtualization for Block @@ -69,6 +68,4 @@ sequence. .. toctree:: :maxdepth: 2 - Upgrading Ceph - .. _get packages: ../install/get-packages diff --git a/doc/radosgw/index.rst b/doc/radosgw/index.rst index bb7280f7009a8..957c3641d639e 100644 --- a/doc/radosgw/index.rst +++ b/doc/radosgw/index.rst @@ -38,7 +38,7 @@ you may write data with one API and retrieve it with the other. .. toctree:: :maxdepth: 1 - Manual Install w/Civetweb <../../install/install-ceph-gateway> + Manual Install w/Civetweb <../../install/ceph-deploy/install-ceph-gateway> HTTP Frontends Pool Placement and Storage Classes Multisite Configuration -- 2.39.5