Skip to content

Commit 7cdb884

Browse files
authored
Merge pull request #45611 from johnwilkins/BZ2004210-4
BZ#2004210: Restructuring modules and ensuring compliance with style guide.
2 parents 079ccf0 + 01631e4 commit 7cdb884

15 files changed

+139
-60
lines changed

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

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,22 @@ include::modules/ipi-install-extracting-the-openshift-installer.adoc[leveloffset
1717
include::modules/ipi-install-creating-an-rhcos-images-cache.adoc[leveloffset=+1]
1818

1919
[id="ipi-install-configuration-files"]
20-
== Configuration files
20+
== Configuring the install-config.yaml file
2121

2222
include::modules/ipi-install-configuring-the-install-config-file.adoc[leveloffset=+2]
2323

24+
include::modules/ipi-install-additional-install-config-parameters.adoc[leveloffset=+2]
25+
26+
include::modules/ipi-install-bmc-addressing.adoc[leveloffset=+2]
27+
28+
include::modules/ipi-install-bmc-addressing-for-dell-idrac.adoc[leveloffset=+2]
29+
30+
include::modules/ipi-install-bmc-addressing-for-hpe-ilo.adoc[leveloffset=+2]
31+
32+
include::modules/ipi-install-bmc-addressing-for-fujitsu-irmc.adoc[leveloffset=+2]
33+
34+
include::modules/ipi-install-root-device-hints.adoc[leveloffset=+2]
35+
2436
include::modules/ipi-install-setting-proxy-settings-within-install-config.adoc[leveloffset=+2]
2537

2638
include::modules/ipi-install-modifying-install-config-for-no-provisioning-network.adoc[leveloffset=+2]
@@ -30,38 +42,29 @@ include::modules/ipi-install-modifying-install-config-for-dual-stack-network.ado
3042
include::modules/ipi-install-configuring-host-network-interfaces-in-the-install-config.yaml-file.adoc[leveloffset=+2]
3143

3244
[role="_additional-resources"]
33-
.Additional resources
45+
== Additional resources
3446

3547
* xref:../../release_notes/ocp-4-11-release-notes.adoc#ocp-4-11-known-issues[OpenShift Container Platform 4.11 release notes]
3648

3749
include::modules/ipi-install-configuring-managed-secure-boot-in-the-install-config-file.adoc[leveloffset=+2]
3850

39-
include::modules/ipi-install-additional-install-config-parameters.adoc[leveloffset=+2]
40-
41-
include::modules/ipi-install-bmc-addressing.adoc[leveloffset=+2]
42-
43-
include::modules/ipi-install-bmc-addressing-for-dell-idrac.adoc[leveloffset=+2]
44-
45-
include::modules/ipi-install-bmc-addressing-for-hpe-ilo.adoc[leveloffset=+2]
46-
47-
include::modules/ipi-install-bmc-addressing-for-fujitsu-irmc.adoc[leveloffset=+2]
48-
49-
include::modules/ipi-install-root-device-hints.adoc[leveloffset=+2]
51+
[id="ipi-install-manifest-configuration-files"]
52+
== Manifest configuration files
5053

5154
include::modules/ipi-install-creating-the-openshift-manifests.adoc[leveloffset=+2]
5255

5356
include::modules/ipi-install-configuring-ntp-for-disconnected-clusters.adoc[leveloffset=+2]
5457

5558
include::modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc[leveloffset=+2]
5659

60+
include::modules/ipi-install-deploying-routers-on-worker-nodes.adoc[leveloffset=+2]
61+
5762
include::modules/ipi-install-configuring-bios-for-worker-node.adoc[leveloffset=+2]
5863

5964
include::modules/ipi-install-configuring-raid-for-worker-node.adoc[leveloffset=+2]
6065

6166
include::modules/ipi-install-creating-a-disconnected-registry.adoc[leveloffset=+1]
6267

63-
include::modules/ipi-install-deploying-routers-on-worker-nodes.adoc[leveloffset=+1]
64-
6568
include::modules/ipi-install-validation-checklist-for-installation.adoc[leveloffset=+1]
6669

6770
include::modules/ipi-install-deploying-the-cluster-via-the-openshift-installer.adoc[leveloffset=+1]
@@ -71,6 +74,6 @@ include::modules/ipi-install-following-the-installation.adoc[leveloffset=+1]
7174
include::modules/ipi-install-verifying-static-ip-address-configuration.adoc[leveloffset=+1]
7275

7376
[role="_additional-resources"]
74-
.Additional resources
77+
== Additional resources
7578

7679
* xref:../../updating/understanding-upgrade-channels-release.adoc#understanding-upgrade-channels_understanding-upgrade-channels-releases[{product-title} upgrade channels and releases]

modules/ipi-install-additional-install-config-parameters.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,6 @@ You must provide a valid MAC address from the host if you disabled the `provisio
203203

204204
| `networkConfig`
205205
|
206-
| Set this optional parameter to configure the network interface of a host. See "(Optional) Configuring host network interfaces in the `install-config.yaml` file" for additional details.
206+
| Set this optional parameter to configure the network interface of a host. See "(Optional) Configuring host network interfaces" for additional details.
207207

208208
|===

modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
:_content-type: PROCEDURE
66
[id='configure-network-components-to-run-on-the-control-plane_{context}']
7-
= (Optional) Configure network components to run on the control plane
7+
= (Optional) Configuring network components to run on the control plane
88

99
You can configure networking components to run exclusively on the control plane nodes. By default, {product-title} allows any node in the machine config pool to host the `ingressVIP` virtual IP address. However, some environments deploy worker nodes in separate subnets from the control plane nodes. When deploying remote workers in separate subnets, you must place the `ingressVIP` virtual IP address exclusively with the control plane nodes.
1010

modules/ipi-install-configuring-bios-for-worker-node.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
:_content-type: PROCEDURE
66
[id="configuring-bios-for-worker-node_{context}"]
7-
= Configuring the BIOS for worker nodes
7+
= (Optional) Configuring the BIOS for worker nodes
88

99
The following procedure configures the BIOS for a worker node during the installation process.
1010

modules/ipi-install-configuring-host-network-interfaces-in-the-install-config.yaml-file.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
:_content-type: PROCEDURE
66
[id="configuring-host-network-interfaces-in-the-install-config-yaml-file_{context}"]
7-
= (Optional) Configuring host network interfaces in the `install-config.yaml` file
7+
= (Optional) Configuring host network interfaces
88

99
During installation, you can set the `networkConfig` configuration setting in the `install-config.yaml` file to configure host network interfaces using NMState. To use the `networkConfig` configuration setting, you must provide an NMState YAML configuration.
1010

modules/ipi-install-configuring-managed-secure-boot-in-the-install-config-file.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
:_content-type: PROCEDURE
66
[id="configuring-managed-secure-boot-in-the-install-config-file_{context}"]
7-
= (Optional) Configuring managed Secure Boot in the `install-config.yaml` file
7+
= (Optional) Configuring managed Secure Boot
88

99
You can enable managed Secure Boot when deploying an installer-provisioned cluster using Redfish BMC addressing, such as `redfish`, `redfish-virtualmedia`, or `idrac-virtualmedia`. To enable managed Secure Boot, add the `bootMode` configuration setting to each node:
1010

modules/ipi-install-configuring-raid-for-worker-node.adoc

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@
44

55
:_content-type: PROCEDURE
66
[id="configuring-raid-for-worker-node_{context}"]
7-
= Configuring RAID for worker nodes
7+
= (Optional) Configuring RAID for worker nodes
88

9-
The following procedure configures RAID (Redundant Array of Independent Disks) for the worker node during the installation process.
9+
The following procedure configures a redundant array of independent disks (RAID) for the worker node during the installation process.
1010

1111
[NOTE]
1212
====
13-
. Only nodes with BMC (Baseboard Management Controller) type `irmc` are supported. Other types of nodes are currently not supported.
14-
. If you want to configure hardware RAID for the node, make sure the node has a RAID controller.
13+
. Only nodes with baseboard management controller (BMC) type `irmc` are supported. Other types of nodes are currently not supported.
14+
. If you want to configure a hardware RAID for the node, make sure the node has a RAID controller.
1515
====
1616

1717
.Procedure
18-
. Create manifests.
18+
19+
. Create the manifests.
1920

2021
. Modify the BMH (Bare Metal Host) file corresponding to the worker:
2122
+
@@ -55,4 +56,4 @@ spec:
5556
+
5657
.. If you do not add a `raid` field in the `spec` section, the original RAID configuration is not deleted, and no new configuration will be performed.
5758

58-
. Create cluster.
59+
. Create the cluster.

0 commit comments

Comments
 (0)