From 2a5f404840e94bafc3e842112baa40a0efafc731 Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Wed, 27 Aug 2025 09:01:42 -0400 Subject: [PATCH] Remove bare metal control plane content for OCPBUGS-22683 --- ...ion-osp-deploying-bare-metal-machines.adoc | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/modules/installation-osp-deploying-bare-metal-machines.adoc b/modules/installation-osp-deploying-bare-metal-machines.adoc index d9cc121edd8d..74a77d97cd5e 100644 --- a/modules/installation-osp-deploying-bare-metal-machines.adoc +++ b/modules/installation-osp-deploying-bare-metal-machines.adoc @@ -14,7 +14,7 @@ endif::[] If you want your cluster to use bare metal machines, modify the ifdef::osp-ipi[`install-config.yaml`] ifndef::osp-ipi[`inventory.yaml`] -file. Your cluster can have both control plane and compute machines running on bare metal, or just compute machines. +file. Your cluster can have compute machines running on bare metal. Bare-metal compute machines are not supported on clusters that use Kuryr. @@ -51,37 +51,29 @@ endif::osp-ipi[] ifdef::osp-ipi[] . In the `install-config.yaml` file, edit the flavors for machines: -.. If you want to use bare-metal control plane machines, change the value of `controlPlane.platform.openstack.type` to a bare metal flavor. .. Change the value of `compute.platform.openstack.type` to a bare metal flavor. -.. If you want to deploy your machines on a pre-existing network, change the value of `platform.openstack.machinesSubnet` to the {rh-openstack} subnet UUID of the network. Control plane and compute machines must use the same subnet. +.. If you want to deploy your machines on a pre-existing network, change the value of `platform.openstack.machinesSubnet` to the {rh-openstack} subnet UUID of the network. + .An example bare metal `install-config.yaml` file [source,yaml] ---- -controlPlane: - platform: - openstack: - type: <1> -... - compute: - architecture: amd64 hyperthreading: Enabled name: worker platform: openstack: - type: <2> + type: <1> replicas: 3 ... platform: openstack: - machinesSubnet: <3> + machinesSubnet: <2> ... ---- -<1> If you want to have bare-metal control plane machines, change this value to a bare metal flavor. -<2> Change this value to a bare metal flavor to use for compute machines. -<3> If you want to use a pre-existing network, change this value to the UUID of the {rh-openstack} subnet. +<1> Change this value to a bare metal flavor to use for compute machines. +<2> If you want to use a pre-existing network, change this value to the UUID of the {rh-openstack} subnet. Use the updated `install-config.yaml` file to complete the installation process. @@ -91,7 +83,6 @@ endif::osp-ipi[] ifndef::osp-ipi[] . In the `inventory.yaml` file, edit the flavors for machines: -.. If you want to use bare-metal control plane machines, change the value of `os_flavor_master` to a bare metal flavor. .. Change the value of `os_flavor_worker` to a bare metal flavor. + .An example bare metal `inventory.yaml` file @@ -105,14 +96,13 @@ all: # User-provided values os_subnet_range: '10.0.0.0/16' - os_flavor_master: 'my-bare-metal-flavor' <1> - os_flavor_worker: 'my-bare-metal-flavor' <2> + os_flavor_master: 'my-vm-flavor' + os_flavor_worker: 'my-bare-metal-flavor' <1> os_image_rhcos: 'rhcos' os_external_network: 'external' ... ---- -<1> If you want to have bare-metal control plane machines, change this value to a bare metal flavor. -<2> Change this value to a bare metal flavor to use for compute machines. +<1> Change this value to a bare metal flavor to use for compute machines. Use the updated `inventory.yaml` file to complete the installation process. Machines that are created during deployment use the flavor that you