redhat-cop · semlohnayr · Feb 11, 2022 · Feb 12, 2022
diff --git a/docs/bmquickstart-static.md b/docs/bmquickstart-static.md
@@ -46,7 +46,7 @@ git clone https://github.com/redhat-cop/ocp4-helpernode
 cd ocp4-helpernode
 ```
 
-Create the [vars-static.yaml](examples/vars-static.yaml) file with the IP addresss that will be assigned to the masters/workers/boostrap. The IP addresses need to be right since they will be used to create your DNS server.
+Create the [vars-static.yaml](examples/vars-static.yaml) file with the IP addresss that will be assigned to the control plane nodes/workers/boostrap. The IP addresses need to be right since they will be used to create your DNS server.
 
 ```
 cp docs/examples/vars-static.yaml .
@@ -115,7 +115,7 @@ compute:
   replicas: 0
 controlPlane:
   hyperthreading: Enabled
-  name: master
+  name: controlplane
   replicas: 3
 metadata:
   name: ocp4
@@ -215,7 +215,7 @@ On your laptop/workstation visit the status page
 firefox http://192.168.7.77:9000
 ```
 
-You'll see the bootstrap turn "green" and then the masters turn "green", then the bootstrap turn "red". This is your indication that you can continue.
+You'll see the bootstrap turn "green" and then the control plane nodes turn "green", then the bootstrap turn "red". This is your indication that you can continue.
 
 ### ISO Maker
 

diff --git a/docs/bmquickstart.md b/docs/bmquickstart.md
@@ -47,7 +47,7 @@ git clone https://github.com/redhat-cop/ocp4-helpernode
 cd ocp4-helpernode
 ```
 
-Get the mac address of the instances/vms/servers that are going to be your OpenShift 4 cluster. At a minimum you need 1 bootstrap, 3 masters, and 2 workers. So you'll need to have 6 Mac Addresses
+Get the mac address of the instances/vms/servers that are going to be your OpenShift 4 cluster. At a minimum you need 1 bootstrap, 3 control plane nodes, and 2 workers. So you'll need to have 6 Mac Addresses
 
 Edit the [vars.yaml](examples/vars.yaml) file with the mac addresses of your instances.
 
@@ -117,7 +117,7 @@ compute:
   replicas: 0
 controlPlane:
   hyperthreading: Enabled
-  name: master
+  name: controlplane
   replicas: 3
 metadata:
   name: ocp4
@@ -196,7 +196,7 @@ firefox http://192.168.7.77:9000
 ```
 > :warning: Make sure you don't expose this port in public cloud environments!
 
-You'll see the bootstrap turn "green" and then the masters turn "green", then the bootstrap turn "red". This is your indication that you can continue.
+You'll see the bootstrap turn "green" and then the control plane nodes turn "green", then the bootstrap turn "red". This is your indication that you can continue.
 
 ## Wait for install
 

diff --git a/docs/examples/install-config-example.yaml b/docs/examples/install-config-example.yaml
@@ -6,7 +6,7 @@ compute:
   replicas: 0
 controlPlane:
   hyperthreading: Enabled
-  name: master
+  name: controlplane
   replicas: 3
 metadata:
   name: ocp4

diff --git a/docs/examples/install-config-local-registry-example.yaml b/docs/examples/install-config-local-registry-example.yaml
@@ -6,7 +6,7 @@ compute:
   replicas: 0
 controlPlane:
   hyperthreading: Enabled
-  name: master
+  name: controlplane
   replicas: 3
 metadata:
   name: ocp4

diff --git a/docs/examples/vars-chrony.yaml b/docs/examples/vars-chrony.yaml
@@ -20,14 +20,14 @@ bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
   macaddr: "52:54:00:60:72:67"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
     macaddr: "52:54:00:e7:9d:67"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
     macaddr: "52:54:00:80:16:23"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
     macaddr: "52:54:00:d5:1c:39"
 workers:

diff --git a/docs/examples/vars-compact-static.yaml b/docs/examples/vars-compact-static.yaml
@@ -11,12 +11,12 @@ dns:
 bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
 other:
   - name: "non-cluster-vm"

diff --git a/docs/examples/vars-compact.yaml b/docs/examples/vars-compact.yaml
@@ -20,14 +20,14 @@ bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
   macaddr: "52:54:00:60:72:67"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
     macaddr: "52:54:00:e7:9d:67"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
     macaddr: "52:54:00:80:16:23"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
     macaddr: "52:54:00:d5:1c:39"
 other:

diff --git a/docs/examples/vars-ha-ppc64le.yaml b/docs/examples/vars-ha-ppc64le.yaml
@@ -20,14 +20,14 @@ bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
   macaddr: "52:54:00:60:72:67"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
     macaddr: "52:54:00:e7:9d:67"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
     macaddr: "52:54:00:80:16:23"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
     macaddr: "52:54:00:d5:1c:39"
 workers:

diff --git a/docs/examples/vars-ha.yaml b/docs/examples/vars-ha.yaml
@@ -20,14 +20,14 @@ bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
   macaddr: "52:54:00:60:72:67"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
     macaddr: "52:54:00:e7:9d:67"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
     macaddr: "52:54:00:80:16:23"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
     macaddr: "52:54:00:d5:1c:39"
 workers:

diff --git a/docs/examples/vars-local-registry-ppc64le.yaml b/docs/examples/vars-local-registry-ppc64le.yaml
@@ -20,14 +20,14 @@ bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
   macaddr: "52:54:00:60:72:67"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
     macaddr: "52:54:00:e7:9d:67"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
     macaddr: "52:54:00:80:16:23"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
     macaddr: "52:54:00:d5:1c:39"
 workers:

diff --git a/docs/examples/vars-local-registry.yaml b/docs/examples/vars-local-registry.yaml
@@ -20,14 +20,14 @@ bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
   macaddr: "52:54:00:60:72:67"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
     macaddr: "52:54:00:e7:9d:67"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
     macaddr: "52:54:00:80:16:23"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
     macaddr: "52:54:00:d5:1c:39"
 workers:

diff --git a/docs/examples/vars-nfs.yaml b/docs/examples/vars-nfs.yaml
@@ -11,12 +11,12 @@ dns:
 bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
 workers:
   - name: "worker0"

diff --git a/docs/examples/vars-nightlies.yaml b/docs/examples/vars-nightlies.yaml
@@ -20,14 +20,14 @@ bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
   macaddr: "52:54:00:60:72:67"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
     macaddr: "52:54:00:e7:9d:67"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
     macaddr: "52:54:00:80:16:23"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
     macaddr: "52:54:00:d5:1c:39"
 workers:

diff --git a/docs/examples/vars-ppc64le.yaml b/docs/examples/vars-ppc64le.yaml
@@ -20,14 +20,14 @@ bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
   macaddr: "52:54:00:60:72:67"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
     macaddr: "52:54:00:e7:9d:67"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
     macaddr: "52:54:00:80:16:23"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
     macaddr: "52:54:00:d5:1c:39"
 workers:

diff --git a/docs/examples/vars-static-nightlies.yaml b/docs/examples/vars-static-nightlies.yaml
@@ -11,12 +11,12 @@ dns:
 bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
 workers:
   - name: "worker0"

diff --git a/docs/examples/vars-static.yaml b/docs/examples/vars-static.yaml
@@ -11,12 +11,12 @@ dns:
 bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
 workers:
   - name: "worker0"

diff --git a/docs/examples/vars.yaml b/docs/examples/vars.yaml
@@ -20,14 +20,14 @@ bootstrap:
   name: "bootstrap"
   ipaddr: "192.168.7.20"
   macaddr: "52:54:00:60:72:67"
-masters:
-  - name: "master0"
+controlplane_nodes:
+  - name: "controlplane0"
     ipaddr: "192.168.7.21"
     macaddr: "52:54:00:e7:9d:67"
-  - name: "master1"
+  - name: "controlplane1"
     ipaddr: "192.168.7.22"
     macaddr: "52:54:00:80:16:23"
-  - name: "master2"
+  - name: "controlplane2"
     ipaddr: "192.168.7.23"
     macaddr: "52:54:00:d5:1c:39"
 workers:

diff --git a/docs/iso-maker.md b/docs/iso-maker.md
@@ -1,6 +1,6 @@
 # RHCOS ISO Maker
 
-You can create a custom ISO using [Chuckers' ISO Maker repo](https://github.com/chuckersjp/coreos-iso-maker). This playbook will create a single ISO that has a menu entry for each component (bootstrap/masters/workers).
+You can create a custom ISO using [Chuckers' ISO Maker repo](https://github.com/chuckersjp/coreos-iso-maker). This playbook will create a single ISO that has a menu entry for each component (bootstrap/control plane nodes/workers).
 
 Although very useful, with my opinionated playbook and his opinionated playbook; it makes it difficult to incorporate it within my playbook. Therefore, I've created this little "how to use the ISO maker with the helpernode".
 
@@ -56,15 +56,15 @@ all:
         bootstrap.ocp4.example.com:
           ipv4: 192.168.7.20
 
-    masters:
+    controlplane_nodes:
       hosts:
-        master0.ocp4.example.com:
+        controlplane0.ocp4.example.com:
           ipv4: 192.168.7.21
 
-        master1.ocp4.example.com:
+        controlplane1.ocp4.example.com:
           ipv4: 192.168.7.22
 
-        master2.ocp4.example.com:
+        controlplane2.ocp4.example.com:
           ipv4: 192.168.7.23
 
     workers:
@@ -85,7 +85,7 @@ You'll need to move some stuff around where the ISO maker expects them to find t
 cp /var/www/html/install/bios.raw.gz /var/www/html/
 cp /var/www/html/ignition/*.ign /var/www/html/
 ln -s /var/www/html/worker.ign /var/www/html/workers.ign
-ln -s /var/www/html/master.ign /var/www/html/masters.ign
+ln -s /var/www/html/controlplane.ign /var/www/html/controlplane_nodes.ign
 chmod o+r /var/www/html/*
 restorecon -vR /var/www/html
 ```
@@ -106,7 +106,7 @@ When you boot into this ISO, you'll be greeted with the following menu.
 
 ![isomaker](images/rhcos-iso-maker.png)
 
-Choose the correct option for the server you're installing. I would boot them in the following order: bootstrap, masters, and then workers.
+Choose the correct option for the server you're installing. I would boot them in the following order: bootstrap, control plane nodes, and then workers.
 
 ## Success