Merge pull request #39792 from cherraz/BZ2020713

BZ2020713: Remove DU requirement tables and merge info with procedures

Author: michaelryanpeter

modules/ztp-configuring-a-static-ip.adoc

@@ -35,34 +35,34 @@ spec:
      - name: eth0
        type: ethernet
        state: up
-       mac-address: <mac-address> <1>
        ipv4:
          enabled: true
          address:
-           - ip: <ip-address> <2>
-             prefix-length: <public-network-prefix> <3>
+           - ip: <ip-address> <1>
+             prefix-length: <public-network-prefix> <2>
          dhcp: false
    dns-resolver:
      config:
        server:
-         - <dns-resolver> <4>
+         - <dns-resolver> <3>
    routes:
      config:
        - destination: 0.0.0.0/0
-         next-hop-address: <gateway> <5>
+         next-hop-address: <gateway> <4>
          next-hop-interface: eth0
          table-id: 254
  interfaces:
-   - name: "eth0" <6>
-     macAddress: <mac-address> <7>
+   - name: "eth0" <5>
+     macAddress: <mac-address> <6>
 ----
-<1> `mac-address` is the MAC address of the target bare metal machine, that is, the same MAC address used in the `BareMetalHost` resource.
-<2> `ip-address` is the static IP address of the target bare metal machine.
-<3> `public-network-prefix` is the static IP address’s subnet for the target bare metal machine.
-<4> `dns-resolver` is the DNS server for the target bare metal machine.
-<5> `gateway` is the gateway for the target bare metal machine.
-<6> `name` must match the name specified in the `interfaces` section.
-<7> `mac-address` must match the MAC address specified in the `interfaces` section.
+<1> `ip-address` is the static IP address of the target bare metal machine.
+<2> `public-network-prefix` is the static IP address’s subnet prefix for the target bare metal machine.
+<3> `dns-resolver` is the DNS server for the target bare metal machine.
+<4> `gateway` is the gateway for the target bare metal machine.
+<5> `name` must match the name specified in the `interfaces` section.
+<6> `mac-address` is the mac address of the interface.
+
+. When creating the `BareMetalHost` custom resource, ensure that one of its mac addresses matches a mac address in the `NMStateConfig` target bare metal machine.
 
 . When creating the `InfraEnv` custom resource, reference the label from the `NMStateConfig` custom resource in the `InfraEnv` custom resource:
 +

modules/ztp-creating-siteconfig-custom-resources.adoc

@@ -137,21 +137,23 @@ spec:
     name: <cluster-image-set> <1>
   networking:
     clusterNetwork:
-    - cidr: 10.128.0.0/14
+    - cidr: <cluster-network-cidr> <2>
       hostPrefix: 23
     machineNetwork:
-    - cidr: <machine-network-cidr> <2>
+    - cidr: <machine-network-cidr> <3>
     serviceNetwork:
-    - 172.30.0.0/16
+    - <service-network-cidr> <4>
   provisionRequirements:
     controlPlaneAgents: 1
     workerAgents: 0
-  sshPublicKey: <public-key> <3>
+  sshPublicKey: <public-key> <5>
 ----
 +
-<1> `cluster-image-set` is the name of the ClusterImageSet custom resource used to install {product-title} on the DU.
-<2> `machine-network-cidr` is the target bare metal machine’s CIDR.
-<3> `public-key` entered as plain text can be used to SSH into the target bare metal machine after the host is installed.
+<1> `cluster-image-set` is the name of the ClusterImageSet custom resource used to install {product-title} on the bare metal machine.
+<2> `cluster-network-cidr` is a block of IPv4 or IPv6 addresses in CIDR notation used for communication among cluster nodes. 
+<3> `machine-network-cidr` is a block of IPv4 or IPv6 addresses in CIDR notation used for the target bare metal server external communication. Also used to determine the API and Ingress VIP addresses when provisioning DU single node clusters.
+<4> `service-network-cidr` is a block of IPv4 or IPv6 addresses in CIDR notation used for cluster services internal communication. 
+<5> `public-key` entered as plain text can be used to SSH into the node after it is installed.
 +
 [NOTE]
 ====
@@ -273,7 +275,7 @@ spec:
   automatedCleaningMode: disabled
   online: true
 ----
-<1> `bmc-address` is the baseboard address of the target bare metal machine.
+<1> `bmc-address` is the baseboard management console address of the installation ISO on the target bare metal machine.
 <2> `mac-address` is the target bare metal machine’s MAC address.
 +
 Optionally, you can add `bmac.agent-install.openshift.io/hostname: <host-name>` as an annotation to set the managed cluster’s hostname, otherwise it will default to either a hostname from the DHCP server or local host.

modules/ztp-du-host-requirements.adoc

@@ -27,8 +27,6 @@ include::modules/ztp-low-latency-for-distributed-units-dus.adoc[leveloffset=+1]
 
 include::modules/ztp-du-host-bios-requirements.adoc[leveloffset=+1]
 
-include::modules/ztp-du-host-requirements.adoc[leveloffset=+1]
-
 include::modules/ztp-acm-preparing-to-install-disconnected-acm.adoc[leveloffset=+1]
 
 include::modules/ztp-disconnected-environment-prereqs.adoc[leveloffset=+2]