Skip to content

Commit d07847d

Browse files
authored
Merge pull request #62717 from amolnar-rh/OCPBUGS-13354
/lgtm, merging
2 parents b6647cf + 2bc3bca commit d07847d

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

modules/agent-install-ipi-install-root-device-hints.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The `rootDeviceHints` parameter enables the installer to provision the {op-syste
1313
|===
1414
| Subfield | Description
1515

16-
| `deviceName` | A string containing a Linux device name like `/dev/vda`. The hint must match the actual value exactly.
16+
| `deviceName` | A string containing a Linux device name such as `/dev/vda` or `/dev/disk/by-path/`. It is recommended to use the `/dev/disk/by-path/<device_path>` link to the storage location. The hint must match the actual value exactly.
1717

1818
| `hctl` | A string containing a SCSI bus address like `0:0:0:0`. The hint must match the actual value exactly.
1919

modules/ipi-install-root-device-hints.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The `rootDeviceHints` parameter enables the installer to provision the {op-syste
1313
|===
1414
| Subfield | Description
1515

16-
| `deviceName` | A string containing a Linux device name like `/dev/vda`. The hint must match the actual value exactly.
16+
| `deviceName` | A string containing a Linux device name such as `/dev/vda` or `/dev/disk/by-path/`. It is recommended to use the `/dev/disk/by-path/<device_path>` link to the storage location. The hint must match the actual value exactly.
1717

1818
| `hctl` | A string containing a SCSI bus address like `0:0:0:0`. The hint must match the actual value exactly.
1919

scalability_and_performance/ztp_far_edge/ztp-deploying-far-edge-sites.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ include::modules/ztp-deploying-a-site.adoc[leveloffset=+1]
3838
3939
* xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#bmc-addressing_ipi-install-installation-workflow[BMC addressing]
4040
41+
* xref:../../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#root-device-hints_preparing-to-install-with-agent-based-installer[About root device hints]
42+
4143
include::modules/ztp-monitoring-installation-progress.adoc[leveloffset=+1]
4244

4345
include::modules/ztp-troubleshooting-ztp-gitops-installation-crs.adoc[leveloffset=+1]

scalability_and_performance/ztp_far_edge/ztp-manual-install.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ include::modules/ztp-generating-install-and-config-crs-manually.adoc[leveloffset
2727
2828
* xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#bmc-addressing_ipi-install-installation-workflow[BMC addressing]
2929
30+
* xref:../../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#root-device-hints_preparing-to-install-with-agent-based-installer[About root device hints]
31+
3032
include::modules/ztp-creating-the-site-secrets.adoc[leveloffset=+1]
3133

3234
include::modules/ztp-configuring-kernel-arguments-for-discovery-iso-in-manual-installations.adoc[leveloffset=+1]

snippets/ztp-example-siteconfig.adoc

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ spec:
3939
name: "bmh-secret" <8>
4040
bootMACAddress: "AA:BB:CC:DD:EE:11"
4141
bootMode: "UEFI" <9>
42-
rootDeviceHints:
42+
rootDeviceHints: <10>
4343
wwn: "0x11111000000asd123"
44-
cpuset: "0-1,52-53" <10>
45-
nodeNetwork: <11>
44+
cpuset: "0-1,52-53" <11>
45+
nodeNetwork: <12>
4646
interfaces:
4747
- name: eno1
4848
macAddress: "AA:BB:CC:DD:EE:11"
@@ -53,7 +53,7 @@ spec:
5353
state: up
5454
ipv4:
5555
enabled: false
56-
ipv6: <12>
56+
ipv6: <13>
5757
enabled: true
5858
address:
5959
- ip: 1111:2222:3333:4444::aaaa:1
@@ -77,9 +77,10 @@ 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. {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.
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.
83-
<10> `cpuset` must match the value set in the cluster `PerformanceProfile` CR `spec.cpu.reserved` field for workload partitioning.
84-
<11> Specifies the network settings for the node.
85-
<12> Configures the IPv6 address for the host. For {sno} clusters with static IP addresses, the node-specific API and Ingress IPs should be the same.
83+
<10> Specifies the device for deployment. Identifiers that are stable across reboots are recommended, for example `wwn: <disk_wwn>` or `deviceName: /dev/disk/by-path/<device_path>`. For a detailed list of stable identifiers, see the _About root device hints_ section.
84+
<11> `cpuset` must match the value set in the cluster `PerformanceProfile` CR `spec.cpu.reserved` field for workload partitioning.
85+
<12> Specifies the network settings for the node.
86+
<13> Configures the IPv6 address for the host. For {sno} clusters with static IP addresses, the node-specific API and Ingress IPs should be the same.

0 commit comments

Comments
 (0)