Skip to content

Commit 221138a

Browse files
authored
Merge pull request #59514 from rohennes/TELCODOCS-432-rhacm2-8
/lgtm, merging TELCODOCS-432: Adding iPXE content again for RHACM 2.8 release
2 parents b33f683 + daca3a2 commit 221138a

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

modules/ztp-deploying-a-site.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ The folder includes example files for single node, three-node, and standard clus
6767
.. Change the cluster and host details in the example file to match the type of cluster you want. For example:
6868
+
6969
include::snippets/ztp-example-siteconfig.adoc[]
70-
+
71-
[NOTE]
72-
====
73-
For more information about BMC addressing, see the "Additional resources" section.
74-
====
7570
7671
.. You can inspect the default set of extra-manifest `MachineConfig` CRs in `out/argocd/extra-manifest`. It is automatically applied to the cluster when it is installed.
7772

modules/ztp-installation-crs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The following table lists the installation CRs that are automatically applied by
2222

2323
|`BareMetalHost`
2424
|Contains the connection information for the Baseboard Management Controller (BMC) of the target bare-metal host.
25-
|Provides access to the BMC to load and start the discovery image on the target server by using the Redfish protocol.
25+
|Provides access to the BMC to load and start the discovery image on the target server. {ztp-first} supports iPXE and virtual media booting by using Redfish or IPMI protocols. To use iPXE booting, you must use {rh-rhacm} 2.8 or later.
2626

2727
|`InfraEnv`
2828
|Contains information for installing {product-title} on the target bare-metal host.

snippets/ztp-example-siteconfig.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ spec:
7777
<4> Cluster labels must correspond to the `bindingRules` field in the `PolicyGenTemplate` CRs that you define. For example, `policygentemplates/common-ranGen.yaml` applies to all clusters with `common: true` set, `policygentemplates/group-du-sno-ranGen.yaml` applies to all clusters with `group-du-sno: ""` set.
7878
<5> Optional. The CR specifed under `KlusterletAddonConfig` is used to override the default `KlusterletAddonConfig` that is created for the cluster.
7979
<6> For single-node deployments, define a single 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`.
80-
<7> BMC address that you use to access the host. Applies to all cluster types.
80+
<7> BMC address that you use to access the host. Applies to all cluster types. {ztp} supports iPXE and virtual media booting by using Redfish or IPMI protocols. To use iPXE booting, you must use {rh-rhacm} 2.8 or later. For more information about BMC addressing, see the _Additional resources_ section.
8181
<8> Name of the `bmh-secret` CR that you separately create with the host BMC credentials. When creating the `bmh-secret` CR, use the same namespace as the `SiteConfig` CR that provisions the host.
8282
<9> Configures the boot mode for the host. The default value is `UEFI`. Use `UEFISecureBoot` to enable secure boot on the host.
8383
<10> `cpuset` must match the value set in the cluster `PerformanceProfile` CR `spec.cpu.reserved` field for workload partitioning.

0 commit comments

Comments
 (0)