From 14956bd9304e9458db3d80b3b792c43691f4a66c Mon Sep 17 00:00:00 2001 From: Akshay Gadhave Date: Tue, 29 Oct 2024 16:15:32 +0530 Subject: [PATCH] Apply changes suggested in PR --- ...c_updating-disconnected-server-on-EL8.adoc | 3 +++ ...c_updating-disconnected-server-on-EL9.adoc | 19 ++++++++++--------- .../common/modules/proc_updating-server.adoc | 4 ++-- .../modules/proc_updating-smart-proxy.adoc | 4 ++-- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/guides/common/modules/proc_updating-disconnected-server-on-EL8.adoc b/guides/common/modules/proc_updating-disconnected-server-on-EL8.adoc index 477aacdbf4..be268a85a9 100644 --- a/guides/common/modules/proc_updating-disconnected-server-on-EL8.adoc +++ b/guides/common/modules/proc_updating-disconnected-server-on-EL8.adoc @@ -1,6 +1,9 @@ [id="Updating-Disconnected-{project-context}-on-EL8_{context}"] = Updating a disconnected {ProjectServer} on {EL} 8 +You can update your disconnected {Project} on {RHEL} 8 by synchronizing the required repositories on the c +onnected {Project} and syncing the content to the disconnected {Project} using `reposync`. + .Procedure on the connected {ProjectServer} . Ensure that you have synchronized the following repositories in your connected {ProjectServer}: + diff --git a/guides/common/modules/proc_updating-disconnected-server-on-EL9.adoc b/guides/common/modules/proc_updating-disconnected-server-on-EL9.adoc index 1f152cd3af..48ac0efea2 100644 --- a/guides/common/modules/proc_updating-disconnected-server-on-EL9.adoc +++ b/guides/common/modules/proc_updating-disconnected-server-on-EL9.adoc @@ -1,6 +1,8 @@ [id="Updating-Disconnected-{project-context}-on-EL9_{context}"] = Updating a disconnected {ProjectServer} on {EL} 9 +You can update your disconnected {Project} on {RHEL} 9 by synchronizing the required repositories on the connected {Project} and syncing the content to the disconnected {Project} using `reposync`. + .Procedure on the connected {ProjectServer} . Ensure that you have synchronized the following repositories in your connected {ProjectServer}: + @@ -17,7 +19,7 @@ For more information, see {AdministeringDocURL}Creating_an_Organization_Debug_Ce [{RepoRHEL9BaseOS}] name=Red Hat Enterprise Linux 9 for x86_64 - BaseOS (RPMs) baseurl=_https://{foreman-example-com}_/pulp/content/_My_Organization_/Library/content/dist/rhel9/9/x86_64/baseos/os -enabled=1 +enabled = 1 sslclientcert = /etc/pki/katello/certs/org-debug-cert.pem sslclientkey = /etc/pki/katello/certs/org-debug-cert.pem sslcacert = /etc/pki/katello/certs/katello-server-ca.crt @@ -26,7 +28,7 @@ sslverify = 1 [{RepoRHEL9AppStream}] name=Red Hat Enterprise Linux 9 for x86_64 - AppStream (RPMs) baseurl=_https://{foreman-example-com}_/pulp/content/_My_Organization_/Library/content/dist/rhel9/9/x86_64/appstream/os -enabled=1 +enabled = 1 sslclientcert = /etc/pki/katello/certs/org-debug-cert.pem sslclientkey = /etc/pki/katello/certs/org-debug-cert.pem sslcacert = /etc/pki/katello/certs/katello-server-ca.crt @@ -35,7 +37,7 @@ sslverify = 1 [{RepoRHEL9ServerSatelliteServerProjectVersion}] name={ProjectName} {ProjectVersion} for RHEL 9 RPMs x86_64 baseurl=_https://{foreman-example-com}_/pulp/content/_My_Organization_/Library/content/dist/layered/rhel9/x86_64/satellite/{ProjectVersion}/os -enabled=1 +enabled = 1 sslclientcert = /etc/pki/katello/certs/org-debug-cert.pem sslclientkey = /etc/pki/katello/certs/org-debug-cert.pem sslcacert = /etc/pki/katello/certs/katello-server-ca.crt @@ -44,7 +46,7 @@ sslverify = 1 [{RepoRHEL9ServerSatelliteMaintenanceProjectVersion}] name={ProjectName} Maintenance {ProjectVersion} for RHEL 9 RPMs x86_64 baseurl=_https://{foreman-example-com}_/pulp/content/_My_Organization_/Library/content/dist/layered/rhel9/x86_64/sat-maintenance/{ProjectVersion}/os -enabled=1 +enabled = 1 sslclientcert = /etc/pki/katello/certs/org-debug-cert.pem sslclientkey = /etc/pki/katello/certs/org-debug-cert.pem sslcacert = /etc/pki/katello/certs/katello-server-ca.crt @@ -102,22 +104,22 @@ In the following example `/root` is the extraction location. [{RepoRHEL9BaseOS}] name=Red Hat Enterprise Linux 9 for x86_64 - BaseOS (RPMs) baseurl=file:///root/{Project}-repos/{RepoRHEL9BaseOS} -enabled=1 +enabled = 1 [{RepoRHEL9AppStream}] name=Red Hat Enterprise Linux 9 for x86_64 - AppStream (RPMs) baseurl=file:///root/{Project}-repos/{RepoRHEL9AppStream} -enabled=1 +enabled = 1 [{RepoRHEL9ServerSatelliteServerProjectVersion}] name={ProjectNameX} for RHEL 9 Server RPMs x86_64 baseurl=file:///root/{Project}-repos/{RepoRHEL9ServerSatelliteServerProjectVersion} -enabled=1 +enabled = 1 [{RepoRHEL9ServerSatelliteMaintenanceProjectVersion}] name={ProjectName} Maintenance 6 for RHEL 9 Server RPMs x86_64 baseurl=file:///root/{Project}-repos/{RepoRHEL9ServerSatelliteMaintenanceProjectVersion} -enabled=1 +enabled = 1 ---- . In the configuration file, replace the `/root/{Project}-repos` with the extracted location. . Use the health check option to determine if the system is ready for update. @@ -128,7 +130,6 @@ On first use of this command, `{foreman-maintain}` prompts you to enter the hamm # {foreman-maintain} update check \ --whitelist="check-upstream-repository,repositories-validate" ---- -+ . Review the results and address any highlighted error conditions before performing the update. . Due to the lengthy update time, use a utility such as `tmux` to suspend and reattach a communication session. You can then check the update progress without staying connected to the command shell continuously. diff --git a/guides/common/modules/proc_updating-server.adoc b/guides/common/modules/proc_updating-server.adoc index 8114ea728a..f4dd108406 100644 --- a/guides/common/modules/proc_updating-server.adoc +++ b/guides/common/modules/proc_updating-server.adoc @@ -19,7 +19,7 @@ include::snip_warning-maintain-config-noop.adoc[] .Procedure ifdef::satellite[] . Ensure the {Project} Maintenance repository is enabled: -** On {EL} 9: +** On {RHEL} 9: + [options="nowrap" subs="attributes"] ---- @@ -27,7 +27,7 @@ ifdef::satellite[] {RepoRHEL9ServerSatelliteMaintenanceProjectVersion} ---- -** On {EL} 8: +** On {RHEL} 8: + [options="nowrap" subs="attributes"] ---- diff --git a/guides/common/modules/proc_updating-smart-proxy.adoc b/guides/common/modules/proc_updating-smart-proxy.adoc index d13f694ae2..45d1d2bba9 100644 --- a/guides/common/modules/proc_updating-smart-proxy.adoc +++ b/guides/common/modules/proc_updating-smart-proxy.adoc @@ -10,7 +10,7 @@ ifdef::satellite[] endif::[] . Ensure that the {Project} Maintenance repository is enabled: ifdef::satellite[] -** On {EL} 9: +** On {RHEL} 9: + [options="nowrap" subs="attributes"] ---- @@ -18,7 +18,7 @@ ifdef::satellite[] {RepoRHEL9ServerSatelliteMaintenanceProjectVersion} ---- -** On {EL} 8: +** On {RHEL} 8: + [options="nowrap" subs="attributes"] ----