From 30d54512e2002fc6791441f76bdd169d75e8aefa Mon Sep 17 00:00:00 2001 From: Karl Eichwalder Date: Tue, 11 Mar 2025 15:31:54 +0100 Subject: [PATCH 1/2] Removed Ubuntu 20.04 from the list of supported clients (#3774) (#3776) * https://github.com/SUSE/spacewalk/issues/26604 * https://bugzilla.suse.com/show_activity.cgi?id=1238481 --- .changelog | 2 + .../pages/clients-ubuntu.adoc | 49 ++++++++++++++++--- .../pages/supported-features-ubuntu.adoc | 44 +---------------- .../pages/supported-features.adoc | 4 +- 4 files changed, 46 insertions(+), 53 deletions(-) diff --git a/.changelog b/.changelog index 58e3d258343..0ce6bc49721 100644 --- a/.changelog +++ b/.changelog @@ -4,6 +4,8 @@ # - Fixed error in Bat section of Upgrade Guide (bsc#1234567) # For guidelines: https://en.opensuse.org/openSUSE:Creating_a_changes_file_(RPM)#Changelog_section_.28.25changelog.29 +- Removed Ubuntu 20.04 from the list supported clients in Client + Configuration Guide (bsc#1238481) - Fixed typo in Installation and Upgrade Guide (bsc#1237403) - Added note to limit Squid's cache_dir size to 60% of available free space in Installation and Upgrade Guide diff --git a/modules/client-configuration/pages/clients-ubuntu.adoc b/modules/client-configuration/pages/clients-ubuntu.adoc index bbf98eaecf9..10ebc548866 100644 --- a/modules/client-configuration/pages/clients-ubuntu.adoc +++ b/modules/client-configuration/pages/clients-ubuntu.adoc @@ -1,13 +1,12 @@ [[clients-ubuntu]] -= Registering {ubuntu} 20.04, 22.04 and 24.04 Clients += Registering {ubuntu} Clients - -This section contains information about registering {salt} clients running {ubuntu} 20.04 LTS, 22.04 LTS and 24.04 LTS operating systems. +This section contains information about registering clients running {ubuntu} operating systems. // Use list format: repository URLs / packages and metadata / version info [IMPORTANT] ==== -* {ubuntu} 20.04, 22.04 and 24.04 repository URLs are available from {scc} +* {ubuntu} repository URLs are available from {scclongform} * Packages and metadata are provided by Ubuntu, not by {suse} * For supported products, see the support table and the release notes * Canonical does not endorse or support {productname}. @@ -39,9 +38,8 @@ The products you need for this procedure are: |=== | OS Version | Product Name -| {ubuntu} 20.04 | Ubuntu 20.04 -| {ubuntu} 22.04 | Ubuntu 22.04 | {ubuntu} 24.04 | Ubuntu 24.04 +| {ubuntu} 22.04 | Ubuntu 22.04 |=== include::snippets/addchannels_vendor_webui.adoc[] @@ -55,15 +53,50 @@ The channels you need for this procedure are: |=== | OS Version | Base Channel -| {ubuntu} 20.04 | ubuntu-2004-amd64-main-amd64 -| {ubuntu} 22.04 | ubuntu-2204-amd64-main-amd64 | {ubuntu} 24.04 | ubuntu-2404-amd64-main-amd64 +| {ubuntu} 22.04 | ubuntu-2204-amd64-main-amd64 |=== include::snippets/addchannels_vendor_cli.adoc[] + +== Mirror Ubuntu ESM packages + +Canonical provides https://ubuntu.com/security/esm[Expanded Security Maintenance] (**ESM**) packages for https://ubuntu.com/pro[Ubuntu Pro] users and customers. +These packages offer longer maintenance (_10 to 12 years_) for several operating system components and selected applications. + +These repositories can also be synchronized within {productname} if you extract the required **GPG keys** and your personal **Bearer Token** from a system registered to Ubuntu Pro. + + +=== Extract GPG keys and Bearer Token + +Register an Ubuntu host with Ubuntu Pro. +You will find your personal registration token in the https://ubuntu.com/pro/dashboard[Ubuntu Pro Dashbaord]. +An https://login.ubuntu.com/[Ubuntu One acconut] is required for this. + +---- +sudo apt-get install ubuntu-advantage-tools +sudo pro attach +---- + +After registration, you will find the Bearer Token in the file `/etc/apt/auth.conf.d/90ubuntu-advantage`: + +---- +machine esm.ubuntu.com/apps/ubuntu/ login bearer password # ubuntu-pro-client +machine esm.ubuntu.com/infra/ubuntu/ login bearer password # ubuntu-pro-client +---- + +[NOTE] +==== +One dedicated bearer token is used per repository. +==== + +Configure the following repositories within {productname}: + + + == Check Synchronization Status diff --git a/modules/client-configuration/pages/supported-features-ubuntu.adoc b/modules/client-configuration/pages/supported-features-ubuntu.adoc index d640e06b841..97441436af6 100644 --- a/modules/client-configuration/pages/supported-features-ubuntu.adoc +++ b/modules/client-configuration/pages/supported-features-ubuntu.adoc @@ -23,219 +23,177 @@ The icons in this table indicate: |=== | Feature -| {ubuntu}{nbsp}20.04 | {ubuntu}{nbsp}22.04 | {ubuntu}{nbsp}24.04 | Client | {check} | {check} -| {check} | System packages | {ubuntu} Community | {ubuntu} Community -| {ubuntu} Community | Registration | {salt} | {salt} -| {salt} | Install packages | {salt} | {salt} -| {salt} | Apply patches | {check} | {check} -| {check} | Remote commands | {salt} | {salt} -| {salt} | System package states | {salt} | {salt} -| {salt} | System custom states | {salt} | {salt} -| {salt} | Group custom states | {salt} | {salt} -| {salt} | Organization custom states | {salt} | {salt} -| {salt} | System set manager (SSM) | {salt} | {salt} -| {salt} | Product migration | N/A | N/A -| N/A | Basic Virtual Guest Management {star} | {salt} | {salt} -| {salt} | Advanced Virtual Guest Management {star} | {salt} | {salt} -| {salt} | Virtual Guest Installation (Kickstart), as Host OS | {cross} | {cross} -| {cross} | Virtual Guest Installation (image template), as Host OS | {salt} | {salt} -| {salt} | System deployment (PXE/Kickstart) | {cross} | {cross} -| {cross} | System redeployment (Kickstart) | {cross} | {cross} -| {cross} | Contact methods | {salt}: ZeroMQ, Salt-SSH | {salt}: ZeroMQ, Salt-SSH -| {salt}: ZeroMQ, Salt-SSH | Works with {productname} Proxy | {salt} | {salt} -| {salt} | Action chains | {salt} | {salt} -| {salt} | Staging (pre-download of packages) | {salt} | {salt} -| {salt} | Duplicate package reporting | {salt} | {salt} -| {salt} | CVE auditing | {question} | {question} -| {question} | SCAP auditing | {question} | {question} -| {question} | Package verification | {cross} | {cross} -| {cross} | Package locking | {check} | {check} -| {check} | Maintenance Windows | {check} | {check} -| {check} | System locking | {cross} | {cross} -| {cross} | System snapshot | {cross} | {cross} -| {cross} | Configuration file management | {salt} | {salt} -| {salt} | Package profiles | {salt}: Profiles supported, Sync not supported | {salt}: Profiles supported, Sync not supported -| {salt}: Profiles supported, Sync not supported | Power management | {check} | {check} -| {check} | Monitoring server | {cross} | {cross} -| {cross} | Monitored clients | {salt} | {salt} -| {salt} | Docker buildhost | {question} | {question} -| {question} | Build Docker image with OS | {salt} | {salt} -| {salt} | Kiwi buildhost | {cross} | {cross} -| {cross} | Build Kiwi image with OS | {cross} | {cross} -| {cross} | Recurring Actions -| {salt} + | {salt} | {salt} | AppStreams | N/A | N/A -| N/A | Yomi | N/A | N/A -| N/A |=== diff --git a/modules/client-configuration/pages/supported-features.adoc b/modules/client-configuration/pages/supported-features.adoc index aa69a4c98b8..58d1392b6ad 100644 --- a/modules/client-configuration/pages/supported-features.adoc +++ b/modules/client-configuration/pages/supported-features.adoc @@ -87,7 +87,7 @@ The operating system running on a client is supported by the organization that s | {check} | {check} -| {debian} 12, 11 (*) +| {debian} 12 | {x86_64} | {cross} | {check} @@ -112,7 +112,7 @@ The operating system running on a client is supported by the organization that s | {cross} | {check} -| {ubuntu} 24.04, 22.04, 20.04 +| {ubuntu} 24.04, 22.04 | {amd64} | {cross} | {check} From d7c5b78e9bd9f797cec98a80a5ad69b747804445 Mon Sep 17 00:00:00 2001 From: Karl Eichwalder Date: Tue, 11 Mar 2025 16:10:35 +0100 Subject: [PATCH 2/2] Update modules/client-configuration/pages/clients-ubuntu.adoc --- .../pages/clients-ubuntu.adoc | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/modules/client-configuration/pages/clients-ubuntu.adoc b/modules/client-configuration/pages/clients-ubuntu.adoc index a9b426535f7..618f01a4b7d 100644 --- a/modules/client-configuration/pages/clients-ubuntu.adoc +++ b/modules/client-configuration/pages/clients-ubuntu.adoc @@ -61,42 +61,6 @@ include::snippets/addchannels_vendor_cli.adoc[] - -== Mirror Ubuntu ESM packages - -Canonical provides https://ubuntu.com/security/esm[Expanded Security Maintenance] (**ESM**) packages for https://ubuntu.com/pro[Ubuntu Pro] users and customers. -These packages offer longer maintenance (_10 to 12 years_) for several operating system components and selected applications. - -These repositories can also be synchronized within {productname} if you extract the required **GPG keys** and your personal **Bearer Token** from a system registered to Ubuntu Pro. - - -=== Extract GPG keys and Bearer Token - -Register an Ubuntu host with Ubuntu Pro. -You will find your personal registration token in the https://ubuntu.com/pro/dashboard[Ubuntu Pro Dashbaord]. -An https://login.ubuntu.com/[Ubuntu One acconut] is required for this. - ----- -sudo apt-get install ubuntu-advantage-tools -sudo pro attach ----- - -After registration, you will find the Bearer Token in the file `/etc/apt/auth.conf.d/90ubuntu-advantage`: - ----- -machine esm.ubuntu.com/apps/ubuntu/ login bearer password # ubuntu-pro-client -machine esm.ubuntu.com/infra/ubuntu/ login bearer password # ubuntu-pro-client ----- - -[NOTE] -==== -One dedicated bearer token is used per repository. -==== - -Configure the following repositories within {productname}: - - - == Check Synchronization Status