jeos installation (cleanup) (#623)

* Update modules/installation/pages/install-intro.adoc Co-Authored-By: Lana Brindley <[email protected]> * jeos cleanup * per feedback (remove admonition framing here) * Avoid {macros} in titles * we do not use TIP, use NOTE * note about storage size values (per feedback) * comments between steps cause trouble
SUSE · Aug 8, 2019 · 34d1029 · 34d1029
1 parent 7c37696
commit 34d1029
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 35 deletions.
diff --git a/modules/installation/nav-installation-guide.adoc b/modules/installation/nav-installation-guide.adoc
@@ -13,7 +13,7 @@ ifeval::[{suma-content} == true]
 *** xref:install-server-unified.adoc[Install Server]
 *** xref:install-proxy-unified.adoc[Install Proxy]
 endif::[]
-*** xref:install-vm.adoc[Install VM]
+*** xref:install-vm.adoc[Install Server in a Virtual Machine with JeOS]
 // better disabling for now; needs a complete overhaul
 // 2019-06-04, ke :
 // *** xref:install-server.adoc[Install Server from Packages]

diff --git a/modules/installation/pages/install-intro.adoc b/modules/installation/pages/install-intro.adoc
@@ -1,10 +1,6 @@
 [[installation-intro]]
 = Introduction
 
-
-
-
-
 {productname} provides absolute control over your Linux environment.
 System administrators often have tens, hundreds, or even thousands of client machines they need to look after, all of which require ongoing maintenance, updates, and lifecycle management.
 {productname} allows you to manage all your Linux clients in one place, with one easy-to-understand dashboard.
@@ -21,11 +17,8 @@ Because {productname} allows you to manage large numbers of systems and automati
 ifeval::[{productname} == "SUSE Manager"]
 
 From {slsa}{nbsp}15{nbsp}SP1, {susemgr} Server and Proxy are available as base products, and can be installed with the {slsa} Unified Installer.
-This is the simplest method of installation, and the primary method described in this book.
+This is the default method of installation.
 
 endif::[]
 
-All versions of {productname} can be installed from {productname} installation media.
-Before you begin the installation, you will require an operating system installed on your hardware.
-
-This book guides you through installing the {jeos} operating system in a virtual machine, before performing the {productname} Server and Proxy installations.
+This section guides you through installing the {jeos} operating system in a virtual machine, before performing the {productname} Server installation.
diff --git a/modules/installation/pages/install-vm.adoc b/modules/installation/pages/install-vm.adoc
@@ -1,19 +1,13 @@
 [[install-vm]]
-= Installing the virtual machine environment
+= Install SUSE Manager in a Virtual Machine Environment with JeOS
 
 
 
 [[quickstart.sect.kvm.settings]]
 == Virtual Machine Manager (virt-manager) Settings
 
 This chapter provides the required (KVM) settings for installation of {sle} Just Enough Operating System (JeOS) 15 as the base for {productname}.
-A kernel virtual machine (KVM) combined with Virtual Machine Manager (_virt-manager_) will be used as a sandbox for your first installation.
-
-.{suse} Virtualization Guide
-[TIP]
-====
-For more information on virtualization, see: https://www.suse.com/documentation/sles-15/singlehtml/book_virt/book_virt.html[SUSE Linux Enterprise Virtualization Guide]
-====
+A kernel virtual machine (KVM) combined with Virtual Machine Manager (_virt-manager_) will be used as a sandbox for this installation.
 
 // This section needs revision its still ugly (LKB, KE), but now updated (KE)
 // - 2019-06-19.
@@ -29,34 +23,44 @@ In the following table replace _version_ with the actual product version string.
 | Version:            | SLES_version_-JeOS-for-kvm-and-xen.x86_64-GM.qcow2
 | Memory:             | 4096 MB
 | CPU's:              | 2
-| Storage Format:     |_.qcow2_ 24 GB (Default) JeOS Root Partition
+| Storage Format:     | _.qcow2_ 24 GB (Default) JeOS Root Partition
 | Virtual Disks:      |
 | VirtIO Disk 2       | 101 GB for [path]``/var/spacewalk``
 | VirtIO Disk 3       | 50 GB for [path]``/var/lib/pgsql``
 | VirtIO Disk 4       | 4 GB for swap
 | Name:               | test-setup
-| Network             |Bridge _br0_
+| Network             | Bridge _br0_
 |===
 
-.{suse} Virtualization Guide
-[TIP]
+.{sle} Virtualization Guide
+[NOTE]
 ====
-For more information on virtualization, see: https://www.suse.com/documentation/sles-12/singlehtml/book_virt/book_virt.html[SUSE Linux Enterprise Virtualization Guide]
+For more information on virtualization, see https://www.suse.com/documentation/sles-15/singlehtml/book_virt/book_virt.html[SUSE Linux Enterprise Virtualization Guide].
 ====
 
+
+
 [[jeos.kvm.settings]]
 == JeOS KVM Settings
 
 Create three additional virtual disks required for the {productname} storage partitions.
 
 .Procedure: Creating the Required Partitions with KVM
-. Create a new virtual machine using the downloaded JeOS KVM image and select menu:Import existing disk image[].
-. Configure RAM and number of CPUs (At least 4 GB RAM and 2 CPUs).
-. Name your KVM machine and select the menu:Customize configuration before install[] check box.
+. Create a new virtual machine using the downloaded JeOS KVM image and select [guimenu]``Import existing disk image``.
+. Configure RAM and number of CPUs (at least 4 GB RAM and 2 CPUs).
+. Name your KVM machine and select the [guimenu]``Customize configuration before install`` check box.
 . Select the btn:[Add Hardware] button and create three new virtual disks with the following specifications.
 These disks will be partitioned and mounted in <<proc.jeos.susemgr.prep>>.
 +
 
+[NOTE]
+====
+Storage size values are the absolute minimum—only suitable for a small test or demo installation.
+Especially [path]``/var/spacewalk/`` may quickly need more space.
+Also consider to create a separate partition for [path]``/srv`` where Kiwi images are stored.
+====
++
+
 [cols="1,1,1", options="header"]
 |===
 | VirtIO Storage Disks | Name      | Sizing
@@ -65,28 +69,24 @@ These disks will be partitioned and mounted in <<proc.jeos.susemgr.prep>>.
 | VirtIO Disk 4        | swap      | 4{nbsp}GB
 |===
 
-. Click menu:Begin Installation[] and your new VM will boot from the JeOS image.
+. Click btn:[Begin Installation] to boot the new VM from the JeOS image.
 
 Proceed through the basic JeOS installation prompts until you reach the command line.
 
-.Root Password
-[TIP]
-====
 During the basic installation prompts you are asked to enter the root password.
-Select a strong password and then in the next message box btn:[Confirm root Password].
-====
+In the next message box click btn:[Confirm root Password].
 
 
 
 [[jeos.susemgr.prep]]
-== Preparing JeOS for {productname}
+== Preparing JeOS for SUSE Manager
 
 [[proc.jeos.susemgr.prep]]
 .Procedure: Preparing JeOS for {productname} Installation
 
+// Most steps are currently needed because of 4.0 workarounds
 . Log in as `root`.
 
-// 4.0 workaround
 . Uninstall the `sles-release` package:
 +
 
@@ -113,7 +113,7 @@ SUSEConnect -p sle-module-web-scripting/15.1/x86_64
 SUSEConnect -p sle-module-suse-manager-server/<productnumber>/x86_64
 ----
 +
-TIP: JeOS is configured to install only required packages.
+JeOS is configured to install only required packages.
 To get all features working you should allow to install also recommended packages.
 In `/etc/zypp/zypp.conf` change:
 +
@@ -139,6 +139,13 @@ zypper in -t package yast2-storage-ng
 . Partition and mount the virtual disks at the following locations using {yast} Partitioner ([command]``yast2 disk``).
 +
 
+[NOTE]
+====
+Storage size values are the absolute minimum—only suitable for a small test or demo installation.
+Especially [path]``/var/spacewalk/`` may quickly need more space.
+Also consider to create a separate partition for [path]``/srv`` where Kiwi images are stored.
+====
+
 [cols="1,1,1,1", options="header"]
 |===
 | VirtIO Storage Disks | Name                     | Storage Size | File System Type