Merge pull request #96674 from dfitzmau/OCPBUGS-56925-16

[enterprise-4.16] OCPBUGS-56925: Updated the creating-manifest-file-customized-br-ex-br…

Author: dfitzmau

modules/creating-manifest-file-customized-br-ex-bridge.adoc

@@ -133,24 +133,42 @@ apiVersion: machineconfiguration.openshift.io/v1
 kind: MachineConfig
 metadata:
   labels:
-    machineconfiguration.openshift.io/role: worker <1>
-  name: 10-br-ex-worker <2>
+    machineconfiguration.openshift.io/role: worker
+  name: 10-br-ex-worker <1>
 spec:
   config:
     ignition:
       version: 3.2.0
     storage:
       files:
       - contents:
-          source: data:text/plain;charset=utf-8;base64,<base64_encoded_nmstate_configuration> <3>
+          source: data:text/plain;charset=utf-8;base64,<base64_encoded_nmstate_configuration> <2>
+        mode: 0644
+        overwrite: true
+        path: /etc/nmstate/openshift/worker-0.yml <3>
+      - contents:
+          source: data:text/plain;charset=utf-8;base64,<base64_encoded_nmstate_configuration>
+        mode: 0644
+        overwrite: true
+        path: /etc/nmstate/openshift/worker-1.yml <3>
+# ...
+----
+<1> The name of the policy.
+<2> Writes the encoded base64 information to the specified path.
+<3> For each node in your cluster, specify the hostname path to your node and the base-64 encoded Ignition configuration file data for the machine type. The `worker` role is the default role for nodes in your cluster. The `.yaml` extension does not work when specifying the short hostname, `hostname -s`, path for each node or all nodes in the `MachineConfig` manifest file.
++
+Alternatively, if you have a single global configuration specified in an `/etc/nmstate/openshift/cluster.yml` configuration file that you want to apply to all nodes in your cluster, you do not need to specify the short hostname path for each node, such as `/etc/nmstate/openshift/<node_hostname>.yml`. For example:
++
+[source,yaml]
+----
+# ...
+      - contents:
+          source: data:text/plain;charset=utf-8;base64,<base64_encoded_nmstate_configuration>
         mode: 0644
         overwrite: true
         path: /etc/nmstate/openshift/cluster.yml
 # ...
 ----
-<1> For each node in your cluster, specify the hostname path to your node and the base-64 encoded Ignition configuration file data for the machine type. If you have a single global configuration specified in an `/etc/nmstate/openshift/cluster.yml` configuration file that you want to apply to all nodes in your cluster, you do not need to specify the hostname path for each node. The `worker` role is the default role for nodes in your cluster. The `.yaml` extension does not work when specifying the hostname path for each node or all nodes in the `MachineConfig` manifest file.
-<2> The name of the policy.
-<3> Writes the encoded base64 information to the specified path. 
 endif::postinstall-bare-metal-ipi,postinstall-bare-metal-upi[]
 
 ifdef::postinstall-bare-metal-ipi,postinstall-bare-metal-upi[]
@@ -231,9 +249,9 @@ endif::postinstall-bare-metal-ipi,postinstall-bare-metal-upi[]
 * Scaling compute nodes to apply the manifest object that includes a customized `br-ex` bridge to each compute node that exists in your cluster. For more information, see "Expanding the cluster" in the _Additional resources_ section.
 
 ifeval::["{context}" == "ipi-install-post-installation-configuration"]
-:!postinstall-bare-metal:
+:!postinstall-bare-metal-ipi:
 endif::[]
 ifeval::["{context}" == "bare-metal-configuration"]
-:!postinstall-bare-metal:
+:!postinstall-bare-metal-upi:
 endif::[]