From 043a9ddce8bce7a96cedd86f9d0ade9c614738f5 Mon Sep 17 00:00:00 2001 From: Dominik Gedon Date: Tue, 25 Jun 2024 16:54:28 +0200 Subject: [PATCH 1/6] Remove SUSE Liberty Linux Base Media section For Liberty Linux this is not necessary according to Ricardo. Signed-off-by: Dominik Gedon --- CHANGELOG.md | 1 + .../pages/clients-sleses.adoc | 76 ------------------- 2 files changed, 1 insertion(+), 76 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0259883f76..d7b608f5b4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +- Remove SUSE Liberty Linux Base Media section - Removed outdated disclaimer in CLM examples regarding AppStreams (bsc#1226687) - Documented proper --mirrorPath parameter in disconnected setup chapter of diff --git a/modules/client-configuration/pages/clients-sleses.adoc b/modules/client-configuration/pages/clients-sleses.adoc index 58851c16fd4..2f32ea189f1 100644 --- a/modules/client-configuration/pages/clients-sleses.adoc +++ b/modules/client-configuration/pages/clients-sleses.adoc @@ -28,13 +28,6 @@ endif::[] - -[IMPORTANT] -==== -You are responsible for arranging access to {redhat} or {centos} base media repositories and installation media. -==== - - ifeval::[{suma-content} == true] [IMPORTANT] ==== @@ -179,75 +172,6 @@ endif::[] -[[add.base.media]] -=== Add Base Media - -The {sll} software channels only provide updates, not the packages themselves. -To register {sll} clients, first register the {sll} Product (outlined below) to create the base channel, then import the necessary Red Hat or CentOS packages as custom child channels. -Initial packages must be obtained directly from {redhat} or {centos} before applying updates from {sll}. -Importantly, you do not need to maintain your Red Hat subscriptions, but consult your legal department to check for any ongoing payment obligations to Red Hat during migration. -To ensure you have all the packages you need, use a full DVD image, not a minimal or {jeos} image. - -You can use {productname} custom channels to set up the {rhel} or {centos} media. -All packages on the base media must be mirrored into a child channel. - -You can freely choose the names for the channels. - -include::snippets/manual_channels.adoc[] - - -[IMPORTANT] -==== -For {redhat} 8 clients, add both the Base and AppStream channels. -You require packages from both channels. -If you do not add both channels, you cannot create the bootstrap repository, due to missing packages. -==== - -If you are using modular channels, you must enable the Python 3.6 module stream on the client. -If you do not provide Python 3.6, the installation of the [package]``spacecmd`` package will fail. - - -.Procedure: Adding Base Media to Custom Channels -. Copy the base media image to the {productname} Server container host to the [path]``/tmp/`` directory. -. To get the base media image into the {productname} Server container, use: -+ ----- -mgradm distribution copy /tmp/SLES-ES-7.9-x86_64-DVD.iso sles-es-7 ----- -+ -The destination in the container will be [path]``/srv/www/distributions/sles-es-7``. -. Import the packages into the child channel you created earlier: -+ ----- -spacewalk-repo-sync -c -u file:///srv/www/distributions/sles-es-7/ ----- - - -==== OPTIONAL: Add Base Media from a Content URL - -Alternatively, if you have access to a content URL provided by {redhat} CDN or {centos}, you can create a custom repository to mirror the packages. - -The details you need for this procedure are: - -[[es-repos-manual]] -[cols="1,1", options="header"] -.ES Custom Repository Settings -|=== - -| Option | Parameter -| Repository URL | The content URL provided by {redhat} CDN or {centos} -| Has Signed Metadata? | Uncheck all {redhat} Enterprise repositories -| SSL CA Certificate | [systemitem]``redhat-uep`` ({redhat} only) -| SSL Client Certificate | [systemitem]``Entitlement-Cert-date`` ({redhat} only) -| SSL Client Key | ``Entitlement-Key-date`` ({redhat} only) - -|=== - -include::snippets/manual_repos.adoc[] - -include::snippets/manual_associate.adoc[] - - == Check Synchronization Status ifeval::[{suma-content} == true] From 56bc28a8c1ba1d65506d96feda7e463e7b6cf41b Mon Sep 17 00:00:00 2001 From: Dominik Gedon Date: Tue, 25 Jun 2024 16:55:57 +0200 Subject: [PATCH 2/6] Fix layout in Liberate Formula Signed-off-by: Dominik Gedon --- CHANGELOG.md | 1 + .../specialized-guides/pages/salt/salt-formula-liberate.adoc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7b608f5b4b..8d0427db497 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +- Fixed layout in Liberate Formula - Remove SUSE Liberty Linux Base Media section - Removed outdated disclaimer in CLM examples regarding AppStreams (bsc#1226687) diff --git a/modules/specialized-guides/pages/salt/salt-formula-liberate.adoc b/modules/specialized-guides/pages/salt/salt-formula-liberate.adoc index d458f7b0244..a28dfd774cc 100644 --- a/modules/specialized-guides/pages/salt/salt-formula-liberate.adoc +++ b/modules/specialized-guides/pages/salt/salt-formula-liberate.adoc @@ -65,7 +65,7 @@ tail -f /var/log/rhn/reposync/* Description:: Enter some text describing the activation key. Key:: -Enter the identifier of the key. For example [literal``sll9-default`` for EL 9 systems. +Enter the identifier of the key. For example [literal]``sll9-default`` for EL 9 systems. Note: Keys will have a numeric prefix depending on the organization, so that they are unique. Usage:: Leave blank. From 0ecd5cd11092809fa623f316ee134bc98c2a1fa7 Mon Sep 17 00:00:00 2001 From: Karl Eichwalder Date: Wed, 26 Jun 2024 06:14:17 +0200 Subject: [PATCH 3/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d0427db497..7332288ebfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ - Fixed layout in Liberate Formula -- Remove SUSE Liberty Linux Base Media section +- Removed SUSE Liberty Linux Base Media section - Removed outdated disclaimer in CLM examples regarding AppStreams (bsc#1226687) - Documented proper --mirrorPath parameter in disconnected setup chapter of From abcc05f55ae94f18ba74a3a6642101178c866581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ornela=20Mari=C4=87?= Date: Wed, 26 Jun 2024 10:46:33 +0200 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7332288ebfc..d700488cef6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ - Fixed layout in Liberate Formula -- Removed SUSE Liberty Linux Base Media section +- Removed SUSE Liberty Linux Base Media section from Client Configuration Guide - Removed outdated disclaimer in CLM examples regarding AppStreams (bsc#1226687) - Documented proper --mirrorPath parameter in disconnected setup chapter of From e3ca1955da3284edfc08d60ccb11a97d9e425357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ornela=20Mari=C4=87?= Date: Wed, 26 Jun 2024 10:46:58 +0200 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d700488cef6..8d9a258224d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -- Fixed layout in Liberate Formula +- Fixed layout in Liberate Formula in Specialized Guides - Removed SUSE Liberty Linux Base Media section from Client Configuration Guide - Removed outdated disclaimer in CLM examples regarding AppStreams (bsc#1226687) From 0e7406d74a1188d6690749daf753faff55c7cdf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ornela=20Mari=C4=87?= Date: Wed, 26 Jun 2024 10:47:48 +0200 Subject: [PATCH 6/6] Update modules/specialized-guides/pages/salt/salt-formula-liberate.adoc --- .../specialized-guides/pages/salt/salt-formula-liberate.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/specialized-guides/pages/salt/salt-formula-liberate.adoc b/modules/specialized-guides/pages/salt/salt-formula-liberate.adoc index a28dfd774cc..50512d44c2c 100644 --- a/modules/specialized-guides/pages/salt/salt-formula-liberate.adoc +++ b/modules/specialized-guides/pages/salt/salt-formula-liberate.adoc @@ -65,7 +65,8 @@ tail -f /var/log/rhn/reposync/* Description:: Enter some text describing the activation key. Key:: -Enter the identifier of the key. For example [literal]``sll9-default`` for EL 9 systems. +Enter the identifier of the key. +For example, use [literal]``sll9-default`` for EL 9 systems. Note: Keys will have a numeric prefix depending on the organization, so that they are unique. Usage:: Leave blank.