Merge pull request #33735 from bgilbert/control

Bob Furu · web-flow · commit c6d4032503f0 · 2021-06-22T13:23:38.000-04:00
diff --git a/modules/installation-special-config-kmod.adoc b/modules/installation-special-config-kmod.adoc
@@ -281,7 +281,7 @@ This must include new kernel packages as they are needed to match newly installe
 === Provision kernel modules via a `MachineConfig` object
 
 By packaging kernel module software with a `MachineConfig` object, you can
-deliver that software to worker or master nodes at installation time
+deliver that software to worker or control plane nodes at installation time
 or via the Machine Config Operator.
 
 .Procedure
@@ -396,7 +396,7 @@ systemd:
       enabled: true
 ----
 +
-<1> To deploy on master nodes, change `worker` to `master`.  To deploy on both master and worker nodes, perform the remainder of these instructions once for each node type.
+<1> To deploy on control plane nodes, change `worker` to `master`.  To deploy on both control plane and worker nodes, perform the remainder of these instructions once for each node type.
 
 . Use Butane to generate a machine config YAML file, `99-simple-kmod.yaml`, containing the files and configuration to be delivered:
 +

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ This must include new kernel packages as they are needed to match newly installe`
`281`	`281`	=== Provision kernel modules via a `MachineConfig` object
`282`	`282`
`283`	`283`	By packaging kernel module software with a `MachineConfig` object, you can
`284`		`-deliver that software to worker or master nodes at installation time`
	`284`	`+deliver that software to worker or control plane nodes at installation time`
`285`	`285`	`or via the Machine Config Operator.`
`286`	`286`
`287`	`287`	`.Procedure`
`@@ -396,7 +396,7 @@ systemd:`
`396`	`396`	`enabled: true`
`397`	`397`	`----`
`398`	`398`	`+`
`399`		-<1> To deploy on master nodes, change `worker` to `master`. To deploy on both master and worker nodes, perform the remainder of these instructions once for each node type.
	`399`	+<1> To deploy on control plane nodes, change `worker` to `master`. To deploy on both control plane and worker nodes, perform the remainder of these instructions once for each node type.
`400`	`400`
`401`	`401`	. Use Butane to generate a machine config YAML file, `99-simple-kmod.yaml`, containing the files and configuration to be delivered:
`402`	`402`	`+`