Fix disconnected Upgrade (#4450)

Author: Lennonka

guides/common/modules/proc_upgrading-a-disconnected-project-server.adoc

@@ -46,27 +46,26 @@ This prevents the upgrade process from overwriting your DNS and DHCP configurati
 ----
 
 . Export the required repositories from your connected {ProjectServer} to your disconnected {ProjectServer}:
-.. Ensure that the following repositories are synchronized on your connected server:
+.. Ensure that the following repositories are synchronized on your connected server with the download policy set to *Immediate*:
 +
 * {RepoRHEL9BaseOS}
 * {RepoRHEL9AppStream}
 * {RepoRHEL9ServerSatelliteServerProjectVersion}
+* {RepoRHEL9ServerSatelliteMaintenanceProjectVersion}
 .. List the repositories to identify their IDs:
 +
 [options="nowrap" subs="+quotes"]
 ----
 $ hammer repository list \
 --organization-label _My_Organization_Label_
 ----
-+
-Run this command once for each of the three repositories listed above.
-.. Ensure that the repositories are synchronized on your connected server with the download policy set to `immediate`.
-.. Export each repository in a syncable format by using its repository ID:
+.. Export each repository in the syncable format by using its repository ID:
 +
 [options="nowrap" subs="+quotes,verbatim,attributes"]
 ----
 $ hammer content-export complete repository \
---id=_Repo_ID_ --format=syncable
+--format syncable \
+--id _My_Repository_ID_
 ----
 .. Copy the exported directories to the disconnected {ProjectServer}.
 
@@ -80,41 +79,47 @@ $ hammer content-export complete repository \
 .. Identify the location of the copied exported directories from the syncable export on the connected server.
 .. Create the `/etc/yum.repos.d/upgrade.repo` file and update the `baseurl` directive to point to that location:
 +
-[source, none, options="nowrap" subs="attributes"]
+[source, ini, options="nowrap" subs="+quotes,verbatim,attributes"]
 ----
 [{RepoRHEL9BaseOS}]
 name=Red Hat Enterprise Linux 9 for x86_64 - BaseOS (RPMs)
+enabled=1
 metadata_expire=-1
 gpgcheck=0
-cost=500
-baseurl=file:///_Export_Baseos_Location_/content/dist/rhel9/9/x86_64/baseos/os
+baseurl=file:///_BaseOS_Export_Location_/content/dist/rhel9/9/x86_64/baseos/os
+
 [{RepoRHEL9AppStream}]
 name=Red Hat Enterprise Linux 9 for x86_64 - AppStream (RPMs)
-mediaid=None
+enabled=1
+metadata_expire=-1
+gpgcheck=0
+baseurl=file:///_AppStream_Export_Location_/content/dist/rhel9/9/x86_64/appstream/os
+
+[{RepoRHEL9ServerSatelliteServerProjectVersion}]
+name={ProjectName} {ProjectVersion} for RHEL 9 Server RPMs x86_64
+enabled=0
 metadata_expire=-1
 gpgcheck=0
-cost=500
-baseurl=file:///_Export_Appstream_Location_/content/dist/rhel9/9/x86_64/appstream/os
-[{Project}]
-name={Project}
-mediaid=None
+baseurl=file:///_{Project}_Export_Location_/content/dist/layered/rhel9/x86_64/{project-context}/{ProjectVersion}/os/
+
+[{RepoRHEL9ServerSatelliteMaintenanceProjectVersion}]
+name={ProjectName} Maintenance {ProjectVersion} for RHEL 9 Server RPMs x86_64
+enabled=1
 metadata_expire=-1
 gpgcheck=0
-cost=500
-baseurl=file:///_Export_Location_/content/dist/layered/rhel9/x86_64/{project-context}/{ProjectVersion}/os/
+baseurl=file:///_{Project}_Maintenance_Export_Location_/content/dist/layered/rhel9/x86_64/sat-maintenance/{ProjectVersion}/os/
 ----
-. Upgrade the {foreman-maintain} utility to its latest version:
+. Upgrade the `{foreman-maintain}` utility to its latest version:
 +
 [options="nowrap" subs="attributes"]
 ----
-# {foreman-maintain} self-upgrade --maintenance-repo-label={Project}
+# {foreman-maintain} self-upgrade --maintenance-repo-label={RepoRHEL9ServerSatelliteMaintenanceProjectVersion}
 ----
 . Determine whether your system is ready for {Project} upgrade:
 +
 [options="nowrap" subs="+quotes,verbatim,attributes"]
 ----
-# {foreman-maintain} upgrade check --whitelist="repositories-validate,repositories-setup" \
---target-version={ProjectVersion}
+# {foreman-maintain} upgrade check --whitelist="repositories-validate,repositories-setup"
 ----
 +
 Review the results and address any highlighted error conditions before performing the upgrade.
@@ -124,14 +129,24 @@ Review the results and address any highlighted error conditions before performin
 The `{foreman-maintain} upgrade check` might prompt you for the Hammer admin user credentials.
 These changes are applied to the `/etc/foreman-maintain/foreman-maintain-hammer.yml` file.
 ====
+. Edit the `/etc/yum.repos.d/upgrade.repo` file and enable the {RepoRHEL9ServerSatelliteServerProjectVersion} repository:
++
+[source, ini, options="nowrap" subs="+quotes,verbatim,attributes"]
+----
+[{RepoRHEL9ServerSatelliteServerProjectVersion}]
+name={ProjectName} {ProjectVersion} for RHEL 9 Server RPMs x86_64
+enabled=1
+metadata_expire=-1
+gpgcheck=0
+baseurl=file:///_{Project}_Export_Location_/content/dist/layered/rhel9/x86_64/{project-context}/{ProjectVersion}/os/
+----
 . Run the {ProjectServer} upgrade command.
 Because of the lengthy upgrade time, consider using a utility such as `tmux`.
 For more information, see xref:following_the_progress_of_the_upgrade_upgrading-disconnected[].
 +
 [options="nowrap" subs="+quotes,verbatim,attributes"]
 ----
-# {foreman-maintain} upgrade run --whitelist="repositories-validate,repositories-setup" \
---target-version={ProjectVersion}
+# {foreman-maintain} upgrade run --whitelist="repositories-validate,repositories-setup"
 ----
 +
 If the script fails due to missing or outdated packages, you must download and install these separately.