Uyuni server upgrade keichwa (#385)

keichwa · Lana Brindley · web-flow · commit bb23a0589078 · 2020-07-21T16:19:14.000+02:00
* adjust uyuni server upgrade intro section
* remove already commented section about the update script.
* re-add pg-10to12 and reboot
* Update modules/upgrade/pages/server-intro-uyuni.adoc
Co-authored-by: Lana Brindley &lt;lbrindley@suse.de&gt;
diff --git a/modules/upgrade/nav-upgrade-guide.adoc b/modules/upgrade/nav-upgrade-guide.adoc
@@ -9,15 +9,16 @@ include::./branding/pdf/entities.adoc[]
 endif::[]
 
 * xref:upgrade-overview.adoc[Upgrade Guide]
-** xref:server-intro.adoc[Upgrade the Server]
 ifeval::[{suma-content} == true]
+** xref:server-intro.adoc[Upgrade the Server]
 *** xref:server-x.adoc[Server - X Upgrade]
 *** xref:server-y.adoc[Server - Y Upgrade]
 **** xref:server-y-yast.adoc[With YaST]
 **** xref:server-y-zypper.adoc[With Zypper]
 *** xref:server-z.adoc[Server - Z Upgrade]
 endif::[]
 ifeval::[{uyuni-content} == true]
+** xref:server-intro-uyuni.adoc[Upgrade the Server]
 *** xref:server-minor-upgrade-uyuni.adoc[Server - Minor Upgrade]
 *** xref:server-major-upgrade-uyuni.adoc[Server - Major Upgrade]
 endif::[]
diff --git a/modules/upgrade/pages/server-intro-uyuni.adoc b/modules/upgrade/pages/server-intro-uyuni.adoc
@@ -0,0 +1,14 @@
+[[server-upgrade-intro]]
+= Upgrade the Server
+
+{productname} uses a rolling release versioning schema.
+Check the release notes for information about which upgrade strategy to use to upgrade to the next version:
+
+Minor Upgrades::
+You can consider minor upgrades as regular upgrades.
+For more information, see xref:upgrade:server-minor-upgrade-uyuni.adoc[].
+
+Major Upgrades::
+You can consider major upgrades as special upgrades.
+In this case components such as the base operating system, Salt, or the PostgreSQL database will be upgraded.
+For more information, see xref:upgrade:server-major-upgrade-uyuni.adoc[].
diff --git a/modules/upgrade/pages/server-major-upgrade-uyuni.adoc b/modules/upgrade/pages/server-major-upgrade-uyuni.adoc
@@ -28,53 +28,6 @@ zypper up susemanager
 . Run the [command]``/usr/lib/susemanager/bin/server-migrator.sh`` script to upgrade the base OS and {productname} Server.
 // During migration the script will stop the spacewalk services.
 
-. After the migration is complete, you will need to manually reboot the {productname} Server.
-
-[IMPORTANT]
-====
-You will not be able to fix issues that arise during the migration.
-Ensure you have created a backup before you start the migration.
-If you are running {productname} Server on a virtual machine, we recommend that you create a snapshot before you start.
-====
-
-////
-== The Migration Script
-.Procedure: Migrating to {productname} 4.1
-
-The script runs as [systemitem]``root`` and performs these actions:
-
-
-. Stop the spacewalk services:
-+
-----
-spacewalk-service stop
-----
-
-. Move away the old repository configuration:
-+
-----
-mv /etc/zypp/repos.d /etc/zypp/repos.d.old
-mkdir /etc/zypp/repos.d
-----
-
-. Enable and refresh new repositories:
-+
-----
-zypper ar -n "Main Repository" http://download.opensuse.org/distribution/leap/15.2/repo/oss repo-oss
-zypper ar -n "Main Update Repository" http://download.opensuse.org/update/leap/15.2/oss repo-update
-zypper ar -n "Non-OSS Repository" http://download.opensuse.org/distribution/leap/15.2/repo/non-oss repo-non-oss
-zypper ar -n "Update Repository (Non-Oss)" http://download.opensuse.org/update/leap/15.2/non-oss/ repo-update-non-oss
-zypper ar -n "Uyuni Server Stable" https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/images/repo/Uyuni-Server-POOL-x86_64-Media1/ uyuni-server-stable
-
-zypper ref
-----
-
-. Perform the distribution upgrade:
-+
-----
-zypper -n dup --allow-vendor-change
-----
-
 . To migrate the database to PostgreSQL 12 run the migrate script:
 +
 ----
@@ -84,17 +37,15 @@ zypper -n dup --allow-vendor-change
 For more information about PostgreSQL database migration, see xref:db-migration-12.adoc[].
 
 
-Finally reboot the system.
-This is not part of the script.
-Initiate the reboot manually:
+. After the migration is complete, you will need to manually reboot the {productname} Server:
 
 ----
 shutdown -r now
 ----
 
-[NOTE]
+[IMPORTANT]
 ====
-[command]``spacewalk-schema-upgrade`` is not needed anymore.
-It will be run during [command]``spacewalk-service start`` automatically.
+You will not be able to fix issues that arise during the migration.
+Ensure you have created a backup before you start the migration.
+If you are running {productname} Server on a virtual machine, we recommend that you create a snapshot before you start.
 ====
-////
diff --git a/modules/upgrade/pages/server-minor-upgrade-uyuni.adoc b/modules/upgrade/pages/server-minor-upgrade-uyuni.adoc
@@ -43,9 +43,15 @@ spacewalk-service start
 +
 Reboot the server if a patch update recommends rebooting.
 
+// We can remove  the version info when 4.1 / 2020.07 is released
 [NOTE]
 ====
+ifeval::[{suma-content} == true]
 Starting with {productname} 4.1, [command]``spacewalk-schema-upgrade`` is not needed anymore.
+endif::[]
+ifeval::[{uyuni-content} == true]
+Starting with {productname} 2020.04 [command]``spacewalk-schema-upgrade`` is not needed anymore.
+endif::[]
 The schema upgrade is run automatically when the spacewalk service is started with [command]``spacewalk-service start``.
 ====
 
diff --git a/modules/upgrade/pages/upgrade-overview.adoc b/modules/upgrade/pages/upgrade-overview.adoc
@@ -13,7 +13,8 @@ It is possible to automate some of the upgrades, but others need to be performed
 This guide is not intended to be read cover to cover.
 Instead, navigate to the component you want to upgrade, then identify the versions you are upgrading from and to.
 ====
-// FIXME 2020-05-04, ke: Uyuni uses YYYY.MM
+
+ifeval::[{suma-content} == true]
 {productname} uses an [literal]``X.Y.Z`` versioning schema.
 To determine which upgrade procedure you need, look at which part of the version number is changing.
 
@@ -31,6 +32,13 @@ Upgrading within the same minor version.
 This is often referred to as a maintenance update.
 For example, upgrading from 4.0.0 to 4.0.2.
 
+If you are updating a {productname} Server, see xref:upgrade:server-intro.adoc[].
+endif::[]
+ifeval::[{uyuni-content} == true]
+{productname} uses an [literal]``YYYY.MM`` versioning schema suitable for rolling releases.
+If you are updating a {productname} Server, see xref:upgrade:server-intro-uyuni.adoc[].
+endif::[]
+
 If you are updating a {productname} Proxy, see xref:upgrade:proxy-intro.adoc[].
 
 If you are updating clients, see xref:upgrade:client-intro.adoc[].
