Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove upstream EL7 client repository #3596

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+11 −7
Open

Remove upstream EL7 client repository #3596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56fc56f
Remove unused RHEL 7 attributes
ekohl Jan 20, 2025
ceb3ee2
Replace project-client-RHEL7-url with project-client-name
ekohl Jan 20, 2025
4664bd9
Remove project-client-RHEL7-url in upstream
ekohl Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion guides/common/attributes-base.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
:project-allcaps: FOREMAN
:project-client-url: https://yum.theforeman.org/client/{ProjectVersion}
:project-client-name: {project-client-url}[Foreman Client]
:project-client-RHEL7-url: {project-client-url}/el7/x86_64/foreman-client-release.rpm
:project-client-RHEL8-url: {project-client-url}/el8/x86_64/foreman-client-release.rpm
:project-context: foreman
:project-change-hostname: katello-change-hostname
Expand Down
4 changes: 0 additions & 4 deletions guides/common/attributes-satellite.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,7 @@
:RepoRHEL8ServerSatelliteUtils: satellite-utils-{RepoSatelliteVersion}-for-rhel-8-x86_64-rpms

// RHEL 7 Satellite repos
:RepoRHEL7ServerSatelliteMaintenanceProjectVersion: rhel-7-server-satellite-maintenance-{RepoSatelliteVersion}-rpms
:RepoRHEL7ServerSatelliteServerProjectVersion: rhel-7-server-satellite-{RepoSatelliteVersion}-rpms
:RepoRHEL7ServerSatelliteServerProjectVersionPrevious: rhel-7-server-satellite-{ProjectVersionPrevious}-rpms
:RepoRHEL7ServerSatelliteToolsProjectVersion: rhel-7-server-satellite-client-6-rpms
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this attributes is only used once as value for another attribute. Out of scope but could be simplified:

$ rg -i RepoRHEL7ServerSatelliteToolsProjectVersion
guides/common/attributes-satellite.adoc
163::RepoRHEL7ServerSatelliteToolsProjectVersion: rhel-7-server-satellite-client-6-rpms
169::project-client-RHEL7-url: {RepoRHEL7ServerSatelliteToolsProjectVersion}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I debated that, but I find it worrying we don't have project-client-RHEL9-url either so I decided to leave it out of scope. There's also a chance we'll just drop RHEL 7 in Satellite, but I don't know what the plan for that is right now.

:RepoRHEL7ServerSatelliteUtils: rhel-7-server-satellite-utils-{RepoSatelliteVersion}-rpms
// Used in downstream guides
:RepoRHEL7ServerSoftwareCollections: rhel-server-rhscl-7-rpms

Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/proc_creating-an-activation-key.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ To enable, enter the following command:
----
$ hammer activation-key content-override \
--name "_My_Activation_Key_" \
--content-label {project-client-RHEL7-url} \
--content-label {project-client-name} \
--value 1 \
--organization "_My_Organization_"
----
2 changes: 2 additions & 0 deletions guides/common/modules/proc_registering-clients-using-the-bootstrap-script.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ For more information, see {ManagingHostsDocURL}Registering_Hosts_by_Using_the_Bo
<2> Include the `--force` option to register the client that has been previously registered to a standalone {SmartProxy}.
<3> Include the `--puppet-ca-port 8141` option if you use Puppet.

ifdef::satellite[]
* On {EL} 7 or 6, enter the following command:
+
[options="nowrap" subs="+quotes,attributes"]
Expand All @@ -44,5 +45,6 @@ For more information, see {ManagingHostsDocURL}Registering_Hosts_by_Using_the_Bo
----
<1> Include the `--force` option to register the client that has been previously registered to a standalone {SmartProxy}.
<2> Include the `--puppet-ca-port 8141` option if you use Puppet.
endif::[]

The script prompts for the password corresponding to the {Project} user name you entered with the `--login` option.
9 changes: 8 additions & 1 deletion guides/doc-Release_Notes/topics/foreman.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@ There are no highlights with Foreman {ProjectVersion}.

// If this section would be empty otherwise, uncomment the following line:
ifndef::foreman-deb[]
There are no upgrade warnings with Foreman {ProjectVersion}.
=== EL 7 client repositories dropped

RHEL 7 is out of maintenance since June 2024 and at the same time CentOS Linux 7 went end of life.
With Foreman 3.14 the client repository is no longer built for EL 7.
This primairly affects Katello and OpenSCAP users.

For more details, see the https://community.theforeman.org/t/drop-el7-packages-from-foreman-client-with-foreman-3-14/40505[removal RFC].

endif::[]
ifdef::foreman-deb[]
=== Running Foreman on Debian 11 (Bullseye) is not supported anymore
Expand Down
Loading