From 4360c00f304f162d7712a583b504f8b0d7450247 Mon Sep 17 00:00:00 2001 From: Tim Marx Date: Thu, 18 Apr 2019 11:49:57 +0200 Subject: [PATCH] ceph: move ceph docs to own top level chapter This change should help to make the meanwhile extensive documentation about ceph more visible, therefore ceph now has it's own chapter which is sorted more reasonable after the storage chapter. The formerly known "hyper converged infrastructure" chapter is now integrated in the intro chapter, as it only contains some general information about this topic, which is not specific for ceph. Signed-off-by: Tim Marx --- hyper-converged-infrastructure.adoc | 7 ++++--- pve-admin-guide.adoc | 8 ++------ pve-intro.adoc | 2 ++ pveceph.adoc | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/hyper-converged-infrastructure.adoc b/hyper-converged-infrastructure.adoc index f30723f..c014dc3 100644 --- a/hyper-converged-infrastructure.adoc +++ b/hyper-converged-infrastructure.adoc @@ -1,6 +1,7 @@ [[chapter_hyper_converged_infrastructure]] Hyper-converged Infrastructure -============================== +------------------------------ + ifdef::wiki[] :pve-toplevel: endif::wiki[] @@ -16,7 +17,7 @@ choice to deploy and manage an open source https://en.wikipedia.org/wiki/Hyper-converged_infrastructure[hyper-converged infrastructure]. Benefits of a Hyper-Converged Infrastructure (HCI) with {pve} -------------------------------------------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ A hyper-converged infrastructure (HCI) is especially useful for deployments in which a high infrastructure demand meets a low administration budget, for @@ -43,7 +44,7 @@ HCI provides the following advantages: ifdef::wiki[] See Also --------- +~~~~~~~~ * xref:chapter_pveceph[pveceph - Manage Ceph Services on Proxmox VE Nodes] diff --git a/pve-admin-guide.adoc b/pve-admin-guide.adoc index 9a14da2..cca4d12 100644 --- a/pve-admin-guide.adoc +++ b/pve-admin-guide.adoc @@ -25,12 +25,6 @@ include::pve-installation.adoc[] include::sysadmin.adoc[] -include::hyper-converged-infrastructure.adoc[] - -:leveloffset: 2 -include::pveceph.adoc[] -:leveloffset: 1 - include::pve-gui.adoc[] include::pvecm.adoc[] @@ -39,6 +33,8 @@ include::pmxcfs.adoc[] include::pvesm.adoc[] +include::pveceph.adoc[] + include::pvesr.adoc[] include::qm.adoc[] diff --git a/pve-intro.adoc b/pve-intro.adoc index b55889b..58565a9 100644 --- a/pve-intro.adoc +++ b/pve-intro.adoc @@ -161,6 +161,8 @@ The integrated firewall allows you to filter network packets on any VM or Container interface. Common sets of firewall rules can be grouped into ``security groups''. +include::hyper-converged-infrastructure.adoc[] + Why Open Source --------------- diff --git a/pveceph.adoc b/pveceph.adoc index 122f063..21c7cbe 100644 --- a/pveceph.adoc +++ b/pveceph.adoc @@ -18,8 +18,8 @@ DESCRIPTION ----------- endif::manvolnum[] ifndef::manvolnum[] -Manage Ceph Services on Proxmox VE Nodes -======================================== +Deploy Ceph Cluster on {pve} +=========================== :pve-toplevel: endif::manvolnum[]