Skip to content

Commit ab28ea1

Browse files
Merge pull request #51568 from rohennes/TELCODOCS-432-support-PXE-with-ZTP
TELCODOCS-432: Adding support for iPXE to ZTP
2 parents 7e96ef6 + 0def1d0 commit ab28ea1

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

modules/ztp-deploying-a-site.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ spec:
116116
nodes:
117117
- hostName: "example-node1.example.com" <6>
118118
role: "master"
119-
bmcAddress: "idrac-virtualmedia+https://[1111:2222:3333:4444::bbbb:1]/redfish/v1/Systems/System.Embedded.1" <7>
119+
bmcAddress: idrac-virtualmedia://<out_of_band_ip>/<system_id>/ <7>
120120
bmcCredentialsName:
121121
name: "example-node1-bmh-secret" <8>
122122
bootMACAddress: "AA:BB:CC:DD:EE:11"
@@ -160,7 +160,7 @@ spec:
160160
<4> Applies to three-node and standard clusters. The value defines the cluster network sections.
161161
<5> Applies to three-node and standard clusters. The value defines the cluster network sections.
162162
<6> Applies to all cluster types. For single node deployments, define one host. For three-node deployments, define three hosts. For standard deployments, define three hosts with `role: master` and two or more hosts defined with `role: worker`.
163-
<7> Applies to all cluster types. Specifies the BMC address.
163+
<7> Applies to all cluster types. Specifies the BMC address. ZTP supports iPXE and virtual media booting by using Redfish or IPMI protocols. For more information about BMC addressing, see the _Additional resources_ section.
164164
<8> Applies to all cluster types. Specifies the BMC credentials.
165165
<9> Applies to all cluster types. Specifies the network settings for the node.
166166
@@ -184,4 +184,4 @@ The `SiteConfig` CR creates the following CRs on the hub cluster:
184184
* `NMStateConfig` - One per node
185185
* `ExtraManifestsConfigMap` - Extra manifests. The extra manifests include workload partitioning, mountpoint hiding, sctp enablement, and more. To automatically merge the extra manifests into a single manifest per each `MachineConfigPool` role, which is named as `predefined-extra-manifests-<role>`, set the `.spec.clusters.mergeDefaultMachineConfigs` to `true` in the `SiteConfig.yaml` file.
186186
* `ManagedCluster`
187-
* `KlusterletAddonConfig`
187+
* `KlusterletAddonConfig`

modules/ztp-manually-install-a-single-managed-cluster.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ spec:
271271
automatedCleaningMode: disabled
272272
online: true
273273
----
274-
<1> The baseboard management console address of the installation ISO on the target bare-metal host.
274+
<1> The baseboard management console (BMC) address on the target bare-metal host. ZTP supports iPXE and virtual media booting by using Redfish or IPMI protocols. For more information about BMC addressing, see the _Additional resources_ section.
275275
<2> The MAC address of the target bare-metal host.
276276
+
277277
Optionally, you can add `bmac.agent-install.openshift.io/hostname: <host-name>` as an annotation to set the managed cluster’s hostname. If you don't add the annotation, the hostname will default to either a hostname from the DHCP server or local host.

modules/ztp-ztp-custom-resources.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Both methods create the CRs shown in the following table. On the cluster site, a
2929

3030
|`BareMetalHost`
3131
|Contains the connection information for the Baseboard Management Controller (BMC) of the target bare-metal host.
32-
|Provides access to the BMC in order to load and boot the Discovery image ISO on the target server by using the Redfish protocol.
32+
|Provides access to the BMC to load and boot the discovery image on the target server by using the Redfish protocol. ZTP supports iPXE and virtual media network booting.
3333

3434
|`InfraEnv`
3535
|Contains information for pulling {product-title} onto the target bare-metal host.
@@ -49,7 +49,7 @@ Both methods create the CRs shown in the following table. On the cluster site, a
4949

5050
|`Agent`
5151
|Contains hardware information about the target bare-metal host.
52-
|Created automatically on the hub when the target machine's Discovery image ISO boots.
52+
|Created automatically on the hub when the target machine's discovery image boots.
5353

5454
|`ManagedCluster`
5555
|When a cluster is managed by the hub, it must be imported and known. This Kubernetes object provides that interface.

scalability_and_performance/ztp-deploying-disconnected.adoc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@ include::modules/ztp-customizing-the-install-extra-manifests.adoc[leveloffset=+1
123123

124124
include::modules/ztp-deploying-a-site.adoc[leveloffset=+1]
125125

126+
[role="_additional-resources"]
127+
.Additional resources
128+
129+
* xref:../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#bmc-addressing_ipi-install-installation-workflow[BMC addressing]
130+
126131
include::modules/ztp-talo-integration.adoc[leveloffset=+1]
127132

128133
// End of 340
@@ -196,6 +201,11 @@ include::modules/ztp-roll-out-the-configuration-changes.adoc[leveloffset=+2]
196201

197202
include::modules/ztp-manually-install-a-single-managed-cluster.adoc[leveloffset=+1]
198203

204+
[role="_additional-resources"]
205+
.Additional resources
206+
207+
* xref:../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#bmc-addressing_ipi-install-installation-workflow[BMC addressing]
208+
199209
include::modules/ztp-du-host-bios-requirements.adoc[leveloffset=+2]
200210

201211
include::modules/ztp-configuring-a-static-ip.adoc[leveloffset=+2]

0 commit comments

Comments
 (0)