diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 264976004c..66bf71ad94 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -775,9 +775,6 @@ Topics: Distros: openshift-enterprise - Name: Performing a canary rollout update File: update-using-custom-machine-config-pools - - Name: Updating a cluster that includes RHEL compute machines - File: updating-cluster-rhel-compute - Distros: openshift-enterprise - Name: Updating a cluster in a disconnected environment File: disconnected-update - Name: Updating hardware on nodes running on vSphere @@ -2407,12 +2404,6 @@ Topics: File: applying-autoscaling - Name: Creating infrastructure machine sets File: creating-infrastructure-machinesets -- Name: Adding a RHEL compute machine - File: adding-rhel-compute - Distros: openshift-enterprise -- Name: Adding more RHEL compute machines - File: more-rhel-compute - Distros: openshift-enterprise - Name: Managing user-provisioned infrastructure manually Dir: user_infra Topics: diff --git a/disconnected/updating/disconnected-update-osus.adoc b/disconnected/updating/disconnected-update-osus.adoc index 9d42fcc6dc..7706348a27 100644 --- a/disconnected/updating/disconnected-update-osus.adoc +++ b/disconnected/updating/disconnected-update-osus.adoc @@ -143,4 +143,3 @@ After you configure your cluster to use the installed OpenShift Update Service a ** xref:../../updating/updating_a_cluster/updating-cluster-cli.adoc#updating-cluster-cli[Updating a cluster using the CLI] ** xref:../../updating/updating_a_cluster/control-plane-only-update.adoc#control-plane-only-update[Performing a Control Plane Only update] ** xref:../../updating/updating_a_cluster/update-using-custom-machine-config-pools.adoc#update-using-custom-machine-config-pools[Performing a canary rollout update] -** xref:../../updating/updating_a_cluster/updating-cluster-rhel-compute.adoc#updating-cluster-rhel-compute[Updating a cluster that includes RHEL compute machines] \ No newline at end of file diff --git a/installing/overview/installing-fips.adoc b/installing/overview/installing-fips.adoc index 0d59e4e4ff..7a26816837 100644 --- a/installing/overview/installing-fips.adoc +++ b/installing/overview/installing-fips.adoc @@ -111,5 +111,3 @@ If you are using Azure File storage, you cannot enable FIPS mode. ==== To apply `AES CBC` encryption to your etcd data store, follow the xref:../../security/encrypting-etcd.adoc#encrypting-etcd[Encrypting etcd data] process after you install your cluster. - -If you add {op-system-base} nodes to your cluster, ensure that you enable FIPS mode on the machines before their initial boot. See xref:../../machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Adding RHEL compute machines to an {product-title} cluster] and link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/security_hardening/assembly_installing-the-system-in-fips-mode_security-hardening[Installing the system in FIPS mode]. diff --git a/machine_management/index.adoc b/machine_management/index.adoc index bde131ba78..fa690ca475 100644 --- a/machine_management/index.adoc +++ b/machine_management/index.adoc @@ -98,12 +98,3 @@ You can automatically scale your {product-title} cluster to ensure flexibility f [id="machine-mgmt-intro-add-for-upi_{context}"] == Adding compute machines on user-provisioned infrastructure User-provisioned infrastructure is an environment where you can deploy infrastructure such as compute, network, and storage resources that host the {product-title}. You can xref:../machine_management/user_infra/adding-compute-user-infra-general.adoc#adding-compute-user-infra-general[add compute machines] to a cluster on user-provisioned infrastructure during or after the installation process. - -[id="machine-mgmt-intro-add-rhel_{context}"] -== Adding RHEL compute machines to your cluster - -As a cluster administrator, you can perform the following actions: - -** xref:../machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Add Red Hat Enterprise Linux (RHEL) compute machines], also known as worker machines, to a user-provisioned infrastructure cluster or an installation-provisioned infrastructure cluster. - -** xref:../machine_management/more-rhel-compute.adoc#more-rhel-compute[Add more Red Hat Enterprise Linux (RHEL) compute machines] to an existing cluster. diff --git a/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc b/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc index 89f20c0838..38bac0d60f 100644 --- a/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc +++ b/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc @@ -53,10 +53,6 @@ In {product-title} {product-version}, you use the OpenShift installation program For more information, see xref:../architecture/architecture-installation.adoc#installation-process_architecture-installation[Installation process]. -ifndef::openshift-origin[] -If you want to add {op-system-base-full} worker machines to your {product-title} {product-version} cluster, you use an Ansible playbook to join the {op-system-base} worker machines after the cluster is running. For more information, see xref:../machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Adding {op-system-base} compute machines to an {product-title} cluster]. -endif::[] - [discrete] === Infrastructure options diff --git a/post_installation_configuration/cluster-tasks.adoc b/post_installation_configuration/cluster-tasks.adoc index fd7b89e410..7744e3ae90 100644 --- a/post_installation_configuration/cluster-tasks.adoc +++ b/post_installation_configuration/cluster-tasks.adoc @@ -196,8 +196,6 @@ For user-provisioned infrastructure clusters, you can add worker nodes by using * xref:../post_installation_configuration/node-tasks.adoc#post-install-config-adding-fcos-compute[Adding RHCOS worker nodes to a user-provisioned infrastructure cluster] -* xref:../post_installation_configuration/node-tasks.adoc#post-install-config-adding-rhel-compute[Adding RHEL worker nodes to a user-provisioned infrastructure cluster] - === Adding worker nodes to clusters managed by the Assisted Installer For clusters managed by the Assisted Installer, you can add worker nodes by using the {cluster-manager-first} console, the Assisted Installer REST API or you can manually add worker nodes using an ISO image and cluster Ignition config files. diff --git a/post_installation_configuration/node-tasks.adoc b/post_installation_configuration/node-tasks.adoc index 4929be9380..2698843a8c 100644 --- a/post_installation_configuration/node-tasks.adoc +++ b/post_installation_configuration/node-tasks.adoc @@ -9,28 +9,6 @@ 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. - -include::modules/rhel-compute-overview.adoc[leveloffset=+2] -include::modules/rhel-compute-requirements.adoc[leveloffset=+2] - -[role="_additional-resources"] -.Additional resources - -* xref:../nodes/nodes/nodes-nodes-working.adoc#nodes-nodes-working-deleting_nodes-nodes-working[Deleting nodes] -* xref:../machine_management/creating_machinesets/creating-machineset-azure.adoc#machineset-azure-accelerated-networking_creating-machineset-azure[Accelerated Networking for Microsoft Azure VMs] - -include::modules/csr-management.adoc[leveloffset=+3] -include::modules/rhel-preparing-playbook-machine.adoc[leveloffset=+2] -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 diff --git a/updating/understanding_updates/understanding-openshift-update-duration.adoc b/updating/understanding_updates/understanding-openshift-update-duration.adoc index 2d3aa7fce5..a5af24a128 100644 --- a/updating/understanding_updates/understanding-openshift-update-duration.adoc +++ b/updating/understanding_updates/understanding-openshift-update-duration.adoc @@ -48,16 +48,6 @@ include::modules/update-duration-example.adoc[leveloffset=+2] // Estimating cluster update time include::modules/update-duration-estimate-cluster-update-time.adoc[leveloffset=+1] -ifndef::openshift-origin[] -// {op-system-base-full} compute nodes -include::modules/update-duration-rhel-nodes.adoc[leveloffset=+1] - -[role="_additional-resources"] -.Additional resources - -* xref:../../updating/updating_a_cluster/updating-cluster-rhel-compute.adoc#updating-cluster-rhel-compute[Updating RHEL compute machines] -endif::openshift-origin[] - [role="_additional-resources"] [id="additional-resources_update-duration"] == Additional resources diff --git a/updating/updating_a_cluster/control-plane-only-update.adoc b/updating/updating_a_cluster/control-plane-only-update.adoc index 86b8671c3d..e58b248d44 100644 --- a/updating/updating_a_cluster/control-plane-only-update.adoc +++ b/updating/updating_a_cluster/control-plane-only-update.adoc @@ -43,7 +43,6 @@ include::modules/updating-control-plane-only-update-console.adoc[leveloffset=+2] * xref:../../operators/admin/olm-upgrading-operators.adoc#olm-upgrading-operators[Updating installed Operators] * xref:../../updating/updating_a_cluster/updating-cluster-web-console.adoc#update-upgrading-web_updating-cluster-web-console[Updating a cluster by using the web console] -* xref:../../updating/updating_a_cluster/updating-cluster-rhel-compute.adoc#updating-cluster-rhel-compute[Updating a cluster that includes RHEL compute machines] // Control Plane Only update using the CLI include::modules/updating-control-plane-only-update-cli.adoc[leveloffset=+2] @@ -53,7 +52,6 @@ include::modules/updating-control-plane-only-update-cli.adoc[leveloffset=+2] .Additional resources * xref:../../operators/admin/olm-upgrading-operators.adoc#olm-upgrading-operators[Updating installed Operators] -* xref:../../updating/updating_a_cluster/updating-cluster-rhel-compute.adoc#updating-cluster-rhel-compute[Updating a cluster that includes RHEL compute machines] include::modules/updating-control-plane-only-layered-products.adoc[leveloffset=+2]