From 411ad47e4ffc0e5769cbc71925b734dcb68652cf Mon Sep 17 00:00:00 2001 From: Zac Dover Date: Sun, 22 Jan 2023 02:32:59 +1000 Subject: [PATCH] doc/install: refine index.rst Refine English sentences in doc/install/index.rst. Remove adverbial phrases of time that refer to Nautilus-era features as "new", since that was four years ago. Signed-off-by: Zac Dover (cherry picked from commit e7669539aceffc0f6f5d61bd140f1c7936d21cf9) --- doc/install/index.rst | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/doc/install/index.rst b/doc/install/index.rst index ec53a5fdbba02..58ef92a270c19 100644 --- a/doc/install/index.rst +++ b/doc/install/index.rst @@ -10,27 +10,26 @@ Recommended methods ~~~~~~~~~~~~~~~~~~~ :ref:`Cephadm ` installs and manages a Ceph -cluster using containers and systemd, with tight integration with the CLI and -dashboard GUI. - -* cephadm only supports Octopus and newer releases. -* cephadm is fully integrated with the new orchestration API and - fully supports the new CLI and dashboard features to manage - cluster deployment. -* cephadm requires container support (podman or docker) and +cluster that uses containers and systemd and is tightly integrated with the CLI +and dashboard GUI. + +* cephadm supports only Octopus and newer releases. +* cephadm is fully integrated with the orchestration API and fully supports the + CLI and dashboard features that are used to manage cluster deployment. +* cephadm requires container support (in the form of Podman or Docker) and Python 3. `Rook `_ deploys and manages Ceph clusters running in Kubernetes, while also enabling management of storage resources and -provisioning via Kubernetes APIs. We recommend Rook as the way to run Ceph in +provisioning via Kubernetes APIs. We recommend Rook as the way to run Ceph in Kubernetes or to connect an existing Ceph storage cluster to Kubernetes. -* Rook only supports Nautilus and newer releases of Ceph. +* Rook supports only Nautilus and newer releases of Ceph. * Rook is the preferred method for running Ceph on Kubernetes, or for connecting a Kubernetes cluster to an existing (external) Ceph cluster. -* Rook supports the new orchestrator API. New management features - in the CLI and dashboard are fully supported. +* Rook supports the orchestrator API. Management features in the CLI and + dashboard are fully supported. Other methods ~~~~~~~~~~~~~ @@ -39,16 +38,20 @@ Other methods Ceph clusters using Ansible. * ceph-ansible is widely deployed. -* ceph-ansible is not integrated with the new orchestrator APIs, - introduced in Nautlius and Octopus, which means that newer - management features and dashboard integration are not available. +* ceph-ansible is not integrated with the orchestrator APIs that were + introduced in Nautilus and Octopus, which means that the management features + and dashboard integration introduced in Nautilus and Octopus are not + available in Ceph clusters deployed by means of ceph-ansible. -`ceph-deploy `_ is a tool for quickly deploying clusters. +`ceph-deploy `_ is a +tool that can be used to quickly deploy clusters. It is deprecated. .. IMPORTANT:: - 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. + ceph-deploy is not actively maintained. It is not tested on versions of Ceph + newer than Nautilus. It does not support RHEL8, CentOS 8, or newer operating + systems. `ceph-salt `_ installs Ceph using Salt and cephadm. @@ -67,7 +70,7 @@ Ceph can also be :ref:`installed manually `. Windows ~~~~~~~ -For Windows installations, please consult this document: +For Windows installations, consult this document: `Windows installation guide`_. .. _Windows installation guide: ./windows-install -- 2.39.5