From bc1c71d47efb821d5e2461c4ccefc28ac73dc929 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 5 Oct 2016 10:24:51 +0200 Subject: [PATCH 1/1] move system requirements into separate file, move to chapter Installation --- Makefile | 2 + .../pve-docs-mediawiki-import | 4 ++ pve-installation.adoc | 8 ++++ pve-system-requirements.adoc | 43 +++++++++++++++++++ sysadmin.adoc | 40 ----------------- 5 files changed, 57 insertions(+), 40 deletions(-) create mode 100644 pve-system-requirements.adoc diff --git a/Makefile b/Makefile index a780a6d..cf166fe 100644 --- a/Makefile +++ b/Makefile @@ -102,6 +102,7 @@ GEN_SCRIPTS= \ INSTALLATION_SOURCES= \ pve-usbstick.adoc \ + pve-system-requirements.adoc \ pve-installation.adoc SYSADMIN_PARTS= \ @@ -159,6 +160,7 @@ PVE_ADMIN_GUIDE_SOURCES= \ WIKI_IMPORTS= \ section-pve-usbstick-plain.html \ section-getting-help-plain.html \ + section-pve-system-requirements-plain.html \ $(addsuffix -plain.html, $(addprefix sysadmin-, ${SYSADMIN_PARTS})) \ $(addsuffix -plain.html, $(addprefix chapter-, ${CHAPTER_LIST})) \ $(addsuffix .5-plain.html, ${CONFIG_LIST}) \ diff --git a/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import b/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import index 518b084..8c7e7a0 100755 --- a/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import +++ b/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import @@ -76,6 +76,10 @@ my $docs = { title => "Install from USB Stick", category => $cat_refdoc, }, + 'section-pve-system-requirements-plain.html' => { + title => "System Requirements", + category => $cat_refdoc, + }, 'section-getting-help-plain.html' => { title => "Getting Help", category => $cat_refdoc, diff --git a/pve-installation.adoc b/pve-installation.adoc index 8321992..27f2d72 100644 --- a/pve-installation.adoc +++ b/pve-installation.adoc @@ -24,6 +24,12 @@ within a few minutes, including the following: * Complete toolset * Web based management interface +ifndef::wiki[] + +include::pve-system-requirements.adoc[] + +endif::wiki[] + Using the {pve} Installation CD-ROM ----------------------------------- @@ -194,6 +200,8 @@ Video Tutorials See Also -------- +* link:/wiki/System_Requirements[System Requirements] + * link:/wiki/Package_Repositories[Package Repositories] * link:/wiki/Host_System_Administration[Host System Administration] diff --git a/pve-system-requirements.adoc b/pve-system-requirements.adoc new file mode 100644 index 0000000..b7646ff --- /dev/null +++ b/pve-system-requirements.adoc @@ -0,0 +1,43 @@ +System Requirements +------------------- +include::attributes.txt[] + +For production servers, high quality server equipment is needed. Keep +in mind, if you run 10 Virtual Servers on one machine and you then +experience a hardware failure, 10 services are lost. {pve} +supports clustering, this means that multiple {pve} installations +can be centrally managed thanks to the included cluster functionality. + +{pve} can use local storage (DAS), SAN, NAS and also distributed +storage (Ceph RBD). For details see xref:chapter-storage[chapter storage]. + + +Minimum Requirements, for Evaluation +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +* CPU: 64bit (Intel EMT64 or AMD64) + +* Intel VT/AMD-V capable CPU/Mainboard for KVM Full Virtualization support + +* RAM: 1 GB RAM, plus additional RAM used for guests + +* Hard drive + +* One NIC + + +Recommended System Requirements +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +* CPU: 64bit (Intel EMT64 or AMD64), Multi core CPU recommended + +* Intel VT/AMD-V capable CPU/Mainboard for KVM Full Virtualization support + +* RAM: 8 GB RAM, plus additional RAM used for guests + +* Hardware RAID with batteries protected write cache (``BBU'') or flash + based protection + +* Fast hard drives, best results with 15k rpm SAS, Raid10 + +* At least two NICs, depending on the used storage technology you need more diff --git a/sysadmin.adoc b/sysadmin.adoc index 13c949d..ccba5c9 100644 --- a/sysadmin.adoc +++ b/sysadmin.adoc @@ -27,46 +27,6 @@ topics. They either explains things which are different on {pve}, or tasks which are commonly used on {pve}. For other topics, please refer to the standard Debian documentation. -System requirements -------------------- - -For production servers, high quality server equipment is needed. Keep -in mind, if you run 10 Virtual Servers on one machine and you then -experience a hardware failure, 10 services are lost. {pve} -supports clustering, this means that multiple {pve} installations -can be centrally managed thanks to the included cluster functionality. - -{pve} can use local storage (DAS), SAN, NAS and also distributed -storage (Ceph RBD). For details see xref:chapter-storage[chapter storage]. - -Minimum requirements, for evaluation -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* CPU: 64bit (Intel EMT64 or AMD64) - -* Intel VT/AMD-V capable CPU/Mainboard for KVM Full Virtualization support - -* RAM: 1 GB RAM, plus additional RAM used for guests - -* Hard drive - -* One NIC - -Recommended system requirements -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* CPU: 64bit (Intel EMT64 or AMD64), Multi core CPU recommended - -* Intel VT/AMD-V capable CPU/Mainboard for KVM Full Virtualization support - -* RAM: 8 GB RAM, plus additional RAM used for guests - -* Hardware RAID with batteries protected write cache (``BBU'') or flash - based protection - -* Fast hard drives, best results with 15k rpm SAS, Raid10 - -* At least two NICs, depending on the used storage technology you need more ifdef::wiki[] -- 2.39.2