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.

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

Fixes #37606 - Drop old CentOS installation media #10227

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/controllers/api/v2/media_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class MediaController < V2::BaseController
PATH_INFO = <<~EOS
The path to the medium, can be a URL or a valid NFS server (exclusive of the architecture).

for example http://mirror.centos.org/centos/$version/os/$arch
for example https://mirror.stream.centos.org/$version-Stream/BaseOS/$arch/os
where $arch will be substituted for the host\'s actual OS architecture and $version, $major and $minor
will be substituted for the version of the operating system.

Expand Down
2 changes: 1 addition & 1 deletion app/services/medium_providers/provider.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module MediumProviders
# Example:
# provider = MyMediumProvider.new(centos_host)
# provider.medium_uri
# => #<URI::HTTP http://mirror.centos.org/centos/7/os/x86_64>
# => #<URI::HTTP http://mirror.stream.centos.org/9-Stream/BaseOS/x86_64/os>
class Provider
delegate :logger, :to => :Rails

Expand Down
2 changes: 1 addition & 1 deletion app/views/media/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="tab-pane active" id="primary">
<%= text_f f, :name %>
<%= text_f f, :path, :size => "col-md-8", :help_block => _("The path to the medium, can be a URL or a valid NFS server (exclusive of the architecture).
for example <em>http://mirror.centos.org/centos/$version/os/$arch</em> where <strong>$arch</strong> will be substituted for the host's actual OS architecture and <strong>$version</strong>, <strong>$major</strong> and <strong>$minor</strong> will be substituted for the version of the operating system. Solaris and Debian media may also use <strong>$release</strong>.").html_safe %>
for example <em>https://mirror.stream.centos.org/$version-Stream/BaseOS/$arch/os</em> where <strong>$arch</strong> will be substituted for the host's actual OS architecture and <strong>$version</strong>, <strong>$major</strong> and <strong>$minor</strong> will be substituted for the version of the operating system. Solaris and Debian media may also use <strong>$release</strong>.").html_safe %>
<span id="nfs-section" <%= display?(!required_nfs?) %>>
<%= text_f f, :media_path, :size => "col-md-8", :help_inline => _("The NFS path to the media.") %>
<%= text_f f, :config_path, :size => "col-md-8", :help_inline => _("The NFS path to the jumpstart control files.") %>
Expand Down
12 changes: 1 addition & 11 deletions db/seeds.d/100-installation_media.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,7 @@
Medium.without_auditing do
[
{
:name => "CentOS 7 mirror",
:os_family => "Redhat",
:path => "http://mirror.centos.org/centos/$major/os/$arch",
},
{
:name => "CentOS Stream",
:os_family => "Redhat",
:path => "http://mirror.centos.org/centos/$major-stream/BaseOS/$arch/os",
},
{
:name => "CentOS Stream 9 mirror",
:name => "CentOS mirror",
:os_family => "Redhat",
:path => "http://mirror.stream.centos.org/$major-stream/BaseOS/$arch/os",
},
Expand Down
Loading