Skip to content

Commit 4690a03

Browse files
authored
Merge pull request #81172 from abrennan89/OSDOCS-11819-bm
OSDOCS-11819: Move bare metal config docs to bare metal install section
2 parents f03a09c + a1fb673 commit 4690a03

24 files changed

+82
-121
lines changed

_topic_maps/_topic_map.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,8 +602,6 @@ Topics:
602602
- Name: Configuring a private cluster
603603
Distros: openshift-enterprise,openshift-origin
604604
File: configuring-private-cluster
605-
- Name: Bare metal configuration
606-
File: post-install-bare-metal-configuration
607605
- Name: Configuring multi-architecture compute machines on an OpenShift cluster
608606
Dir: configuring-multi-arch-compute-machines
609607
Distros: openshift-enterprise

installing/installing_bare_metal_ipi/ipi-install-expanding-the-cluster.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ include::modules/ipi-install-replacing-a-bare-metal-control-plane-node.adoc[leve
3030
3131
* xref:../../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backing-up-etcd-data_backup-etcd[Backing up etcd]
3232
33-
* xref:../../post_installation_configuration/post-install-bare-metal-configuration.adoc#post-install-bare-metal-configuration[Bare metal configuration]
33+
* xref:../../installing/installing_bare_metal_ipi/ipi-install-post-installation-configuration.adoc#bmo-config-using-bare-metal-operator_ipi-install-post-installation-configuration[Configuration using the Bare Metal Operator]
3434
3535
* xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#bmc-addressing_ipi-install-installation-workflow[BMC addressing]
3636

installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ include::modules/ipi-install-bmc-addressing.adoc[leveloffset=+2]
6868
[role="_additional-resources"]
6969
.Additional resources
7070

71-
* xref:../../post_installation_configuration/post-install-bare-metal-configuration.adoc#editing-a-baremetalhost-resource_post-install-bare-metal-configuration[Editing a BareMetalHost resource]
71+
* xref:../../installing/installing_bare_metal_ipi/ipi-install-post-installation-configuration.adoc#bmo-editing-a-baremetalhost-resource_ipi-install-post-installation-configuration[Editing a BareMetalHost resource]
7272

7373
// Verifying support for the Redfish API
7474
include::modules/ipi-install-verifying-support-for-redfish-apis.adoc[leveloffset=+2]
@@ -139,7 +139,7 @@ include::modules/ipi-install-configuring-the-bios.adoc[leveloffset=+2]
139139
[id="additional-resources_bare_metal_config"]
140140
.Additional resources
141141

142-
* xref:../../post_installation_configuration/post-install-bare-metal-configuration.adoc#post-install-bare-metal-configuration[Bare metal configuration]
142+
* xref:../../installing/installing_bare_metal_ipi/ipi-install-post-installation-configuration.adoc#bmo-config-using-bare-metal-operator_ipi-install-post-installation-configuration[Configuration using the Bare Metal Operator]
143143

144144
// Optional: Configuring the RAID
145145
include::modules/ipi-install-configuring-the-raid.adoc[leveloffset=+2]
@@ -151,7 +151,7 @@ include::modules/ipi-install-configuring-storage-on-nodes.adoc[leveloffset=+2]
151151
[id="additional-resources_raid_config"]
152152
.Additional resources
153153

154-
* xref:../../post_installation_configuration/post-install-bare-metal-configuration.adoc#post-install-bare-metal-configuration[Bare metal configuration]
154+
* xref:../../installing/installing_bare_metal_ipi/ipi-install-post-installation-configuration.adoc#bmo-config-using-bare-metal-operator_ipi-install-post-installation-configuration[Configuration using the Bare Metal Operator]
155155

156156
* link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/managing_storage_devices/index#partition-naming-scheme_disk-partitions[Partition naming scheme]
157157

@@ -175,4 +175,3 @@ include::modules/ipi-modify-install-config-for-a-disconnected-registry.adoc[leve
175175

176176
// Validation checklist for installation
177177
include::modules/ipi-install-validation-checklist-for-installation.adoc[leveloffset=+1]
178-

installing/installing_bare_metal_ipi/ipi-install-post-installation-configuration.adoc

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,33 @@ include::modules/nw-enabling-a-provisioning-network-after-installation.adoc[leve
1515
// Creating a manifest object that includes a customized `br-ex` bridge
1616
include::modules/creating-manifest-file-customized-br-ex-bridge.adoc[leveloffset=+1]
1717

18+
// Using the Bare Metal Operator
19+
include::modules/bmo-config-using-bare-metal-operator.adoc[leveloffset=+1]
20+
// Bare Metal Operator architecture
21+
include::modules/bmo-bare-metal-operator-architecture.adoc[leveloffset=+2]
22+
// About the BareMetalHost resource
23+
include::modules/bmo-about-the-baremetalhost-resource.adoc[leveloffset=+2]
24+
// Getting the BareMetalHost resource
25+
include::modules/bmo-getting-the-baremetalhost-resource.adoc[leveloffset=+2]
26+
// Editing a BareMetalHost resource
27+
include::modules/bmo-editing-a-baremetalhost-resource.adoc[leveloffset=+2]
28+
// Attaching a non-bootable ISO to a bare-metal node
29+
include::modules/bmo-attaching-a-non-bootable-iso-to-a-bare-metal-node.adoc[leveloffset=+2]
30+
// About the HostFirmwareSettings resource
31+
include::modules/bmo-about-the-hostfirmwaresettings-resource.adoc[leveloffset=+2]
32+
// Getting the HostFirmwareSettings resource
33+
include::modules/bmo-getting-the-hostfirmwaresettings-resource.adoc[leveloffset=+2]
34+
// Editing the HostFirmwareSettings resource
35+
include::modules/bmo-editing-the-hostfirmwaresettings-resource.adoc[leveloffset=+2]
36+
// Verifying the HostFirmware Settings resource is valid
37+
include::modules/bmo-verifying-the-hostfirmware-settings-resource-is-valid.adoc[leveloffset=+2]
38+
// About the FirmwareSchema resource
39+
include::modules/bmo-about-the-firmwareschema-resource.adoc[leveloffset=+2]
40+
// Getting the FirmwareSchema resource
41+
include::modules/bmo-getting-the-firmwareschema-resource.adoc[leveloffset=+2]
42+
// About the HostFirmwareComponents resource
43+
include::modules/bmo-about-the-hostfirmwarecomponents-resource.adoc[leveloffset=+2]
44+
// Getting the HostFirmwareComponents resource
45+
include::modules/bmo-getting-the-hostfirmwarecomponents-resource.adoc[leveloffset=+2]
46+
// Editing the HostFirmwareComponents resource
47+
include::modules/bmo-editing-the-hostfirmwarecomponents-resource.adoc[leveloffset=+2]

installing/overview/cluster-capabilities.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ include::modules/cluster-bare-metal-operator.adoc[leveloffset=+2]
3535
.Additional resources
3636
* xref:../../installing/installing_bare_metal_ipi/ipi-install-overview.adoc#ipi-install-overview[Deploying installer-provisioned clusters on bare metal]
3737
* xref:../../installing/installing_bare_metal/preparing-to-install-on-bare-metal.adoc#preparing-to-install-on-bare-metal[Preparing for bare metal cluster installation]
38-
* xref:../../post_installation_configuration/post-install-bare-metal-configuration.adoc#post-install-bare-metal-configuration[Bare metal configuration]
38+
* xref:../../installing/installing_bare_metal_ipi/ipi-install-post-installation-configuration.adoc#bmo-config-using-bare-metal-operator_ipi-install-post-installation-configuration[Configuration using the Bare Metal Operator]
3939
4040
// Build capability
4141
include::modules/build-config-capability.adoc[leveloffset=+2]

installing/overview/index.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ toc::[]
88

99
include::modules/installation-overview.adoc[leveloffset=+1]
1010

11-
1211
include::modules/install-openshift-common-terms.adoc[leveloffset=+2]
1312

1413
include::modules/installation-process.adoc[leveloffset=+2]
@@ -23,7 +22,7 @@ include::modules/ipi-verifying-nodes-after-installation.adoc[leveloffset=+2]
2322
[role="_additional-resources"]
2423
.Additional resources
2524

26-
* xref:../../post_installation_configuration/post-install-bare-metal-configuration.adoc#getting-the-baremetalhost-resource_post-install-bare-metal-configuration[Getting the BareMetalHost resource]
25+
* xref:../../installing/installing_bare_metal_ipi/ipi-install-post-installation-configuration.adoc#bmo-getting-the-baremetalhost-resource_ipi-install-post-installation-configuration[Getting the BareMetalHost resource]
2726
2827
* xref:../../installing/installing_bare_metal_ipi/ipi-install-installing-a-cluster.adoc#ipi-install-following-the-progress-of-the-installation_ipi-install-installing-a-cluster[Following the progress of the installation]
2928

modules/bmo-about-the-baremetalhost-resource.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// This is included in the following assemblies:
22
//
3-
// post_installation_configuration/post-install-bare-metal-configuration.adoc
3+
// * installing/installing_bare_metal_ipi/ipi-install-post-installation-configuration.adoc
44

55
:_mod-docs-content-type: REFERENCE
6-
[id="about-the-baremetalhost-resource_{context}"]
6+
[id="bmo-about-the-baremetalhost-resource_{context}"]
77
= About the BareMetalHost resource
88

99
Metal^3^ introduces the concept of the `BareMetalHost` resource, which defines a physical host and its properties. The `BareMetalHost` resource contains two sections:

modules/bmo-about-the-firmwareschema-resource.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// This is included in the following assemblies:
22
//
3-
// post_installation_configuration/post-install-bare-metal-configuration.adoc
3+
// * installing/installing_bare_metal_ipi/ipi-install-post-installation-configuration.adoc
44

55
:_mod-docs-content-type: REFERENCE
6-
[id="about-the-firmwareschema-resource_{context}"]
6+
[id="bmo-about-the-firmwareschema-resource_{context}"]
77
= About the FirmwareSchema resource
88

99
BIOS settings vary among hardware vendors and host models. A `FirmwareSchema` resource is a read-only resource that contains the types and limits for each BIOS setting on each host model. The data comes directly from the BMC through Ironic. The `FirmwareSchema` enables you to identify valid values you can specify in the `spec` field of the `HostFirmwareSettings` resource. The `FirmwareSchema` resource has a unique identifier derived from its settings and limits. Identical host models use the same `FirmwareSchema` identifier. It is likely that multiple instances of `HostFirmwareSettings` use the same `FirmwareSchema`.

modules/bmo-about-the-hostfirmwarecomponents-resource.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// This is included in the following assemblies:
22
//
3-
// post_installation_configuration/post-install-bare-metal-configuration.adoc
3+
// * installing/installing_bare_metal_ipi/ipi-install-post-installation-configuration.adoc
44

55
:_mod-docs-content-type: REFERENCE
6-
[id="about-the-hostfirmwarecomponents-resource_{context}"]
6+
[id="bmo-about-the-hostfirmwarecomponents-resource_{context}"]
77
= About the HostFirmwareComponents resource
88

99
Metal^3^ provides the `HostFirmwareComponents` resource, which describes BIOS and baseboard management controller (BMC) firmware versions. The `HostFirmwareComponents` resource contains two sections:
@@ -75,4 +75,4 @@ a| The `updates` configuration setting contains the updated components. The fiel
7575
* `component`: The name of the component.
7676

7777
* `url`: The URL to the component's firmware specification and version.
78-
|====
78+
|====

modules/bmo-about-the-hostfirmwaresettings-resource.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// This is included in the following assemblies:
22
//
3-
// post_installation_configuration/post-install-bare-metal-configuration.adoc
3+
// * installing/installing_bare_metal_ipi/ipi-install-post-installation-configuration.adoc
44

55
:_mod-docs-content-type: REFERENCE
6-
[id="about-the-hostfirmwaresettings-resource_{context}"]
6+
[id="bmo-about-the-hostfirmwaresettings-resource_{context}"]
77
= About the HostFirmwareSettings resource
88

99
You can use the `HostFirmwareSettings` resource to retrieve and manage the BIOS settings for a host. When a host moves to the `Available` state, Ironic reads the host's BIOS settings and creates the `HostFirmwareSettings` resource. The resource contains the complete BIOS configuration returned from the baseboard management controller (BMC). Whereas, the `firmware` field in the `BareMetalHost` resource returns three vendor-independent fields, the `HostFirmwareSettings` resource typically comprises many BIOS settings of vendor-specific fields per host.

0 commit comments

Comments
 (0)