Skip to content

[enterprise-4.5] removing RHEL supported version from OKD #31393

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

Merged
mburke5678 merged 1 commit into from
Apr 7, 2021
Merged

[enterprise-4.5] removing RHEL supported version from OKD #31393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion modules/installation-requirements-user-infra.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,23 @@ ifndef::ibm-power[|4]
|16 GB
|120 GB

ifndef::openshift-origin[]
|Compute
ifdef::ibm-z,ibm-power[|{op-system}]
ifndef::ibm-z,ibm-power[|{op-system} or RHEL 7.8 - 7.9]
|2
|8 GB
|120 GB
endif::openshift-origin[]

ifdef::openshift-origin[]
|Compute
ifdef::ibm-z,ibm-power[|{op-system}]
ifndef::ibm-z,ibm-power[|{op-system} or RHEL 7.7 - 7.8]
ifndef::ibm-z,ibm-power[|{op-system}]
|2
|8 GB
|120 GB
endif::openshift-origin[]

5+a|
^1^ 1 physical core provides 2 vCPUs when hyper-threading is enabled. 1 physical core provides 1 vCPU when hyper-threading is not enabled.
Expand Down
2 changes: 1 addition & 1 deletion modules/rhel-compute-requirements.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The Red Hat Enterprise Linux (RHEL) compute machine hosts, which are also known
* Each system must meet the following hardware requirements:
** Physical or virtual system, or an instance running on a public or private IaaS.
ifdef::openshift-origin[]
** Base OS: Fedora 21, CentOS 7.4, or link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html-single/installation_guide/index[RHEL 7.7-7.8] with "Minimal" installation option.
** Base OS: CentOS 7.4.
endif::[]
ifdef::openshift-enterprise,openshift-webscale[]
** Base OS: link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html-single/installation_guide/index[RHEL 7.7-7.8] with "Minimal" installation option.
Expand Down
2 changes: 2 additions & 0 deletions post_installation_configuration/node-tasks.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ toc::[]
After installing {product-title}, you can further expand and customize your
cluster to your requirements through certain node tasks.

ifndef::openshift-origin[]
[id="post-install-config-adding-rhel-compute"]
== Adding RHEL compute machines to an {product-title} cluster
Understand and work with RHEL compute nodes.
Expand All @@ -19,6 +20,7 @@ include::modules/rhel-preparing-node.adoc[leveloffset=+2]
include::modules/rhel-adding-node.adoc[leveloffset=+2]
include::modules/rhel-ansible-parameters.adoc[leveloffset=+2]
include::modules/rhel-removing-rhcos.adoc[leveloffset=+2]
endif::[]

[id="post-install-config-adding-fcos-compute"]
== Adding {op-system} compute machines to an {product-title} cluster
Expand Down