From 34fd82ab47186663e6fdaa1e7f23a086340bb3af Mon Sep 17 00:00:00 2001
From: Ryan Holmes <ryan@semlohsemaj.com>
Date: Fri, 11 Feb 2022 12:37:43 -0600
Subject: [PATCH 1/2] Updated references for OpenShift 'master' to 'control
 node'

---
 docs/bmquickstart-static.md                   | 12 ++--
 docs/bmquickstart.md                          | 12 ++--
 docs/examples/install-config-example.yaml     |  2 +-
 ...install-config-local-registry-example.yaml |  2 +-
 docs/examples/vars-chrony.yaml                |  8 +--
 docs/examples/vars-compact-static.yaml        |  8 +--
 docs/examples/vars-compact.yaml               |  8 +--
 docs/examples/vars-ha-ppc64le.yaml            |  8 +--
 docs/examples/vars-ha.yaml                    |  8 +--
 .../examples/vars-local-registry-ppc64le.yaml |  8 +--
 docs/examples/vars-local-registry.yaml        |  8 +--
 docs/examples/vars-nfs.yaml                   |  8 +--
 docs/examples/vars-nightlies.yaml             |  8 +--
 docs/examples/vars-ppc64le.yaml               |  8 +--
 docs/examples/vars-static-nightlies.yaml      |  8 +--
 docs/examples/vars-static.yaml                |  8 +--
 docs/examples/vars.yaml                       |  8 +--
 docs/iso-maker.md                             | 14 ++---
 docs/quickstart-powervm.md                    | 20 +++----
 docs/quickstart-ppc64le.md                    | 18 +++---
 docs/quickstart-static.md                     | 12 ++--
 docs/quickstart.md                            | 16 ++---
 docs/vars-doc.md                              | 58 +++++++++----------
 tasks/generate_ssh_keys.yaml                  |  2 +-
 tasks/main.yml                                | 20 +++----
 tasks/validate_host_names.yaml                |  2 +-
 templates/checker.sh.j2                       | 24 ++++----
 templates/default.j2                          |  2 +-
 templates/dhcpd-uefi.conf.j2                  |  2 +-
 templates/dhcpd.conf.j2                       |  2 +-
 ...{grub2-master.j2 => grub2-controlplane.j2} |  2 +-
 templates/haproxy.cfg.j2                      |  8 +--
 .../{pxe-master.j2 => pxe-controlplane.j2}    |  2 +-
 templates/reverse.j2                          |  2 +-
 templates/zonefile.j2                         | 10 ++--
 35 files changed, 174 insertions(+), 174 deletions(-)
 rename templates/{grub2-master.j2 => grub2-controlplane.j2} (95%)
 rename templates/{pxe-master.j2 => pxe-controlplane.j2} (97%)

diff --git a/docs/bmquickstart-static.md b/docs/bmquickstart-static.md
index f4fbd40..f6fd5af 100644
--- 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
@@ -139,12 +139,12 @@ Create the installation manifests
 openshift-install create manifests
 ```
 
-Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
+Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
 
 > :rotating_light: Skip this step if you're installing a compact cluster
 
 ```shell
-$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
+$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
 ```
 
 It should look something like this after you edit it.
@@ -157,7 +157,7 @@ metadata:
   creationTimestamp: null
   name: cluster
 spec:
-  mastersSchedulable: false
+  controlplaneSchedulable: false
   policy:
     name: ""
 status: {}
@@ -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
index 31ef3cd..94d4889 100644
--- 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
@@ -141,12 +141,12 @@ Create the installation manifests
 openshift-install create manifests
 ```
 
-Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
+Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
 
 > :rotating_light: Skip this step if you're installing a compact cluster
 
 ```shell
-$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
+$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
 ```
 
 It should look something like this after you edit it.
@@ -159,7 +159,7 @@ metadata:
   creationTimestamp: null
   name: cluster
 spec:
-  mastersSchedulable: false
+  controlplaneSchedulable: false
   policy:
     name: ""
 status: {}
@@ -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
index 645877d..f662f67 100644
--- 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
index 7f2d898..ea59938 100644
--- 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
index 8c325c4..2a799cd 100644
--- 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
index 120daa7..2fda9de 100644
--- 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
index ea45633..c213098 100644
--- 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
index 6390e84..41d4acc 100644
--- 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
index 26bfbe1..622957a 100644
--- 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
index 1095d35..ea24f93 100644
--- 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
index a517eba..6690e93 100644
--- 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
index 314f2fc..663f423 100644
--- 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
index f894130..44dfbe0 100644
--- 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
index 7e2dd97..ffd9dc9 100644
--- 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
index b4c16c5..817d512 100644
--- 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
index f58e48e..ef8259c 100644
--- 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
index abe77df..7a60dfa 100644
--- 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
index 39fd53e..785ef32 100644
--- 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
 
diff --git a/docs/quickstart-powervm.md b/docs/quickstart-powervm.md
index 38bfaee..b839ce3 100644
--- a/docs/quickstart-powervm.md
+++ b/docs/quickstart-powervm.md
@@ -3,7 +3,7 @@
 This quickstart will get you up and running on PowerVM server managed using [HMC](https://www.ibm.com/support/knowledgecenter/en/9009-22A/p9eh6/p9eh6_kickoff.htm).
 
 This playbook will set up an "all-in-one" node (called ocp4-helpernode), that has all the infrastructure/services in order to install OpenShift 4. 
-This playbook will also install an OpenShift 4 cluster with 3 master nodes and 2 worker nodes.
+This playbook will also install an OpenShift 4 cluster with 3 control plane nodes and 2 worker nodes.
 After you run the playbook, you'll be ready to logon to the OpenShift cluster.
 
 A lot of OpenShift 4 specific jargon is used throughout this doc, so please visit the [official documentation page](https://docs.openshift.com/container-platform/latest) to get familiar with OpenShift 4.
@@ -63,16 +63,16 @@ $ mksyscfg -r lpar -m <managed_system> -i name=ocp4-bootstrap, profile_name=defa
 > **NOTE** Make sure you attach the LPAR to the appropriate network and add storage (HMC GUI or HMC chsyscfg command) after successful LPAR creation.
 > **NOTE** No OS installation is needed at this point.
 
-__Masters__
+__Control Plane Nodes__
 
-Create the three master LPARs.
+Create the three control plane LPARs.
 
 * 2 vCPUs (desired_procs)
 * 32 GB of RAM (desired_mem)
 * 120 GB HD (OS)
 
 ```
-$ for i in master{0..2}
+$ for i in controlplane{0..2}
 do
   mksyscfg -r lpar -m <managed_system> -i name="ocp4-${i}", profile_name=default_profile, lpar_env=aixlinux, shared_proc_pool_util_auth=1, min_mem=32768, desired_mem=32768, max_mem=16384, proc_mode=shared, min_proc_units=0.2, desired_proc_units=0.2, max_proc_units=4.0, min_procs=2, desired_procs=2, max_procs=2, sharing_mode=uncap, uncap_weight=128, max_virtual_slots=64, boot_mode=norm, conn_monitoring=1
 done
@@ -201,7 +201,7 @@ cp docs/examples/vars-ppc64le.yaml vars.yaml
 Edit the `vars.yaml`:
 - Update `helper` section for your helper node info
 - Update `dns` and `dhcp` based on your network setup
-- Update `bootstrap`, `masters` and `workers` with IP and MAC address of the LPARs.
+- Update `bootstrap`, `controlplane_nodes` and `workers` with IP and MAC address of the LPARs.
 
 > **NOTE** See the `vars.yaml` [documentation page](vars-doc.md) for more info about what it does.
 
@@ -243,7 +243,7 @@ compute:
   replicas: 0
 controlPlane:
   hyperthreading: Enabled
-  name: master
+  name: controlplane
   replicas: 3
 metadata:
   name: ocp4
@@ -268,12 +268,12 @@ EOF
 openshift-install create manifests
 ```
 
-Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
+Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
 
 > :rotating_light: Skip this step if you're installing a compact cluster
 
 ```shell
-$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
+$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
 ```
 
 It should look something like this after you edit it.
@@ -286,7 +286,7 @@ metadata:
   creationTimestamp: null
   name: cluster
 spec:
-  mastersSchedulable: false
+  controlplaneSchedulable: false
   policy:
     name: ""
 status: {}
@@ -330,7 +330,7 @@ On your laptop/workstation visit the status page
 firefox http://<helper_ip>: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.
 
 Also you can check all cluster node LPAR status in HMC's partition list view.
 
diff --git a/docs/quickstart-ppc64le.md b/docs/quickstart-ppc64le.md
index 5ef3575..674b2b7 100644
--- a/docs/quickstart-ppc64le.md
+++ b/docs/quickstart-ppc64le.md
@@ -113,12 +113,12 @@ virt-install --name="ocp4-bootstrap" --vcpus=4 --ram=16384 \
   virsh define --file ocp4-bootstrap.xml
 ```
 
-__Masters__
+__Control Plane Nodes__
 
-Create the master VMs
+Create the control plane VMs
 
 ```
-for i in master{0..2}
+for i in controlplane{0..2}
 do
   virt-install --name="ocp4-${i}" --vcpus=4 --ram=16384 \
   --disk path=/var/lib/libvirt/images/ocp4-${i}.qcow2,bus=virtio,size=120 \
@@ -170,7 +170,7 @@ cd ocp4-helpernode
 Get the Mac addresses with this command running from your hypervisor host:
 
 ```
-for i in bootstrap master{0..2} worker{0..1}
+for i in bootstrap controlplane{0..2} worker{0..1}
 do
   echo -ne "${i}\t" ; virsh dumpxml ocp4-${i} | grep "mac address" | cut -d\' -f2
 done
@@ -244,7 +244,7 @@ compute:
   replicas: 0
 controlPlane:
   hyperthreading: Enabled
-  name: master
+  name: controlplane
   replicas: 3
 metadata:
   name: ocp4
@@ -268,12 +268,12 @@ Create the installation manifests
 openshift-install create manifests
 ```
 
-Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
+Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
 
 > :rotating_light: Skip this step if you're installing a compact cluster
 
 ```shell
-$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
+$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
 ```
 
 It should look something like this after you edit it.
@@ -286,7 +286,7 @@ metadata:
   creationTimestamp: null
   name: cluster
 spec:
-  mastersSchedulable: false
+  controlplaneSchedulable: false
   policy:
     name: ""
 status: {}
@@ -323,7 +323,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.
 
 ## Wait for install
 
diff --git a/docs/quickstart-static.md b/docs/quickstart-static.md
index ec6ecc7..f4c13d4 100644
--- a/docs/quickstart-static.md
+++ b/docs/quickstart-static.md
@@ -118,7 +118,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.
 
 > **NOTE** See the `vars.yaml` [documentaion page](vars-doc.md) for more info about what it does.
 
@@ -182,7 +182,7 @@ compute:
   replicas: 0
 controlPlane:
   hyperthreading: Enabled
-  name: master
+  name: controlplane
   replicas: 3
 metadata:
   name: ocp4
@@ -206,12 +206,12 @@ Create the installation manifests
 openshift-install create manifests
 ```
 
-Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
+Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
 
 > :rotating_light: Skip this step if you're installing a compact cluster
 
 ```shell
-$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
+$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
 ```
 
 It should look something like this after you edit it.
@@ -224,7 +224,7 @@ metadata:
   creationTimestamp: null
   name: cluster
 spec:
-  mastersSchedulable: false
+  controlplaneSchedulable: false
   policy:
     name: ""
 status: {}
@@ -293,7 +293,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/quickstart.md b/docs/quickstart.md
index d474c7b..7be77b0 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -101,10 +101,10 @@ Create (but do NOT install) 6 empty VMs. Please follow the [min requirements](ht
 
 __Masters__
 
-Create the master VMs
+Create the control plane VMs
 
 ```
-for i in master{0..2}
+for i in controlplane{0..2}
 do
   virt-install --name="ocp4-${i}" --vcpus=4 --ram=12288 \
   --disk path=/var/lib/libvirt/images/ocp4-${i}.qcow2,bus=virtio,size=120 \
@@ -156,7 +156,7 @@ cd ocp4-helpernode
 Get the Mac addresses with this command running from your hypervisor host:
 
 ```
-for i in bootstrap master{0..2} worker{0..1}
+for i in bootstrap controlplane{0..2} worker{0..1}
 do
   echo -ne "${i}\t" ; virsh dumpxml ocp4-${i} | grep "mac address" | cut -d\' -f2
 done
@@ -230,7 +230,7 @@ compute:
   replicas: 0
 controlPlane:
   hyperthreading: Enabled
-  name: master
+  name: controlplane
   replicas: 3
 metadata:
   name: ocp4
@@ -254,12 +254,12 @@ Create the installation manifests
 openshift-install create manifests
 ```
 
-Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
+Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
 
 > :rotating_light: Skip this step if you're installing a compact cluster
 
 ```shell
-$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
+$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
 ```
 
 It should look something like this after you edit it.
@@ -272,7 +272,7 @@ metadata:
   creationTimestamp: null
   name: cluster
 spec:
-  mastersSchedulable: false
+  controlplaneSchedulable: false
   policy:
     name: ""
 status: {}
@@ -310,7 +310,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/vars-doc.md b/docs/vars-doc.md
index 2d66c6f..104aec1 100644
--- a/docs/vars-doc.md
+++ b/docs/vars-doc.md
@@ -14,9 +14,9 @@ In the first section, you'll see that it's asking for a disk
 disk: vda
 ```
 
-This needs to be set to the disk where you are installing RHCOS on the masters/workers. This will be set in the boot options for the [pxe server](../templates/default.j2).
+This needs to be set to the disk where you are installing RHCOS on the control plane nodes/workers. This will be set in the boot options for the [pxe server](../templates/default.j2).
 
-**NOTE**: This will be the same for ALL masters and workers. Support for "mixed disk" (i.e. if your masters use `sda` and your workers are `vda`) is not supported at this time
+**NOTE**: This will be the same for ALL control plane nodes and workers. Support for "mixed disk" (i.e. if your control plane nodes use `sda` and your workers are `vda`) is not supported at this time
 
 You can, however edit the `/var/lib/tftpboot/pxelinux.cfg/default` file by hand after the install.
 
@@ -86,9 +86,9 @@ dhcp:
 
 Explanation of the options you can set:
 
-* `dhcp.router` - This is the default gateway of your network you're going to assign to the masters/workers
+* `dhcp.router` - This is the default gateway of your network you're going to assign to the control plane nodes/workers
 * `dhcp.bcast` - This is the broadcast address for your network
-* `dhcp.netmask` - This is the netmask that gets assigned to your masters/workers
+* `dhcp.netmask` - This is the netmask that gets assigned to your control plane nodes/workers
 * `dhcp.dns` - This is the domain name server, it is optional, the default value is set to `helper.ipaddr`
 * `dhcp.poolstart` - This is the first address in your dhcp address pool
 * `dhcp.poolend` - This is the last address in your dhcp address pool
@@ -117,31 +117,31 @@ The options are:
 
 ## Master Node section
 
-Similar to the bootstrap section; this sets up master node configuration. Please note that this is an array.
+Similar to the bootstrap section; this sets up control plane node configuration. Please note that this is an array.
 
 ```
-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"
 ```
 
-* `masters.name` - The hostname (**__WITHOUT__** the fqdn) of the master node you want to set (x of 3).
-* `masters.ipaddr` - The IP address (x of 3) that you want set (this modifies the [dhcp config file](../templates/dhcpd.conf.j2#L19), the [dns zonefile](../templates/zonefile.j2#L29), and the [reverse dns zonefile](../templates/reverse.j2#L11))
-* `masters.macaddr` - The mac address for [dhcp reservation](../templates/dhcpd.conf.j2#L19). This option is not needed if you're doing static ips.
+* `controlplane_nodes.name` - The hostname (**__WITHOUT__** the fqdn) of the control plane node you want to set (x of 3).
+* `controlplane_nodes.ipaddr` - The IP address (x of 3) that you want set (this modifies the [dhcp config file](../templates/dhcpd.conf.j2#L19), the [dns zonefile](../templates/zonefile.j2#L29), and the [reverse dns zonefile](../templates/reverse.j2#L11))
+* `controlplane_nodes.macaddr` - The mac address for [dhcp reservation](../templates/dhcpd.conf.j2#L19). This option is not needed if you're doing static ips.
 
 
 **NOTE**: 3 Masters are MANDATORY for installation of OpenShift 4
 
 ## Worker Node section
 
-Similar to the master section; this sets up worker node configuration. Please note that this is an array.
+Similar to the control plane node section; this sets up worker node configuration. Please note that this is an array.
 
 > :rotating_light: This section is optional if you're installing a compact cluster
 
@@ -249,7 +249,7 @@ pxe:
 ```
 
 Default is false to prevent unexpected issues booting hosts in the "other" section.    
-* `pxe.generate_default` - Setting to true Generates a generic default pxe config file with options for hosts not defined in the (bootstrap/master/worker) sections.  It is recommended to modify the template with appropriate boot options 
+* `pxe.generate_default` - Setting to true Generates a generic default pxe config file with options for hosts not defined in the (bootstrap/control plane/worker) sections.  It is recommended to modify the template with appropriate boot options 
 `templates/default.j2` -> `/var/lib/tftpboot/pxelinux.cfg/default`
 
 ### UEFI default config
@@ -403,7 +403,7 @@ The playbook created the `machineConfig` files where you cloned the repo. For ex
 ```shell
 # ll ~/ocp4-helpernode/machineconfig/
 total 8
--rw-r--r--. 1 root root 748 Jul 16 07:59 99-master-chrony-configuration.yaml
+-rw-r--r--. 1 root root 748 Jul 16 07:59 99-controlplane-chrony-configuration.yaml
 -rw-r--r--. 1 root root 748 Jul 16 07:59 99-worker-chrony-configuration.yaml
 ```
 
@@ -416,9 +416,9 @@ cp ~/ocp4-helpernode/machineconfig/* ~/ocp4/openshift/
 Continue on with the installation. Once done you should have chrony setup pointing to your NTP servers.
 
 ```shell
-# oc get machineconfig 99-{master,worker}-chrony-configuration
+# oc get machineconfig 99-{controlplane,worker}-chrony-configuration
 NAME                             GENERATEDBYCONTROLLER   IGNITIONVERSION   AGE
-99-master-chrony-configuration                           2.2.0             42s
+99-controlplane-chrony-configuration                           2.2.0             42s
 99-worker-chrony-configuration                           2.2.0             43s
 ```
 
@@ -439,7 +439,7 @@ makestep 1.0 3
 rtcsync
 ```
 
-> :bulb: This config should be on all the masters and workers.
+> :bulb: This config should be on all the control plane nodes and workers.
 
 __Post-Install__
 
@@ -449,26 +449,26 @@ To set this up post-installation, just apply the `machineConfig` using `oc apply
 oc apply  -f ~/ocp4-helpernode/machineconfig/
 ```
 
-:warning: This will reboot ALL your nodes (masters/workers) in a "rolling" fashion. You can check this with `oc get nodes`
+:warning: This will reboot ALL your nodes (control plane nodes/workers) in a "rolling" fashion. You can check this with `oc get nodes`
 
 ```shell
 # oc get nodes
-NAME                       STATUS                     ROLES    AGE   VERSION
-master0.ocp4.example.com   Ready                      master   41m   v1.17.1+912792b
-master1.ocp4.example.com   Ready                      master   41m   v1.17.1+912792b
-master2.ocp4.example.com   Ready,SchedulingDisabled   master   41m   v1.17.1+912792b
-worker0.ocp4.example.com   Ready,SchedulingDisabled   worker   26m   v1.17.1+912792b
-worker1.ocp4.example.com   Ready                      worker   26m   v1.17.1+912792b
+NAME                             STATUS                     ROLES    AGE   VERSION
+controlplane0.ocp4.example.com   Ready                      master   41m   v1.17.1+912792b
+controlplane1.ocp4.example.com   Ready                      master   41m   v1.17.1+912792b
+controlplane2.ocp4.example.com   Ready,SchedulingDisabled   master   41m   v1.17.1+912792b
+worker0.ocp4.example.com         Ready,SchedulingDisabled   worker   26m   v1.17.1+912792b
+worker1.ocp4.example.com         Ready                      worker   26m   v1.17.1+912792b
 ```
 
 
 This should create the `machineConfig`
 
 ```shell
-# oc get machineconfig 99-{master,worker}-chrony-configuration
-NAME                             GENERATEDBYCONTROLLER   IGNITIONVERSION   AGE
-99-master-chrony-configuration                           2.2.0             42s
-99-worker-chrony-configuration                           2.2.0             43s
+# oc get machineconfig 99-{controlplane,worker}-chrony-configuration
+NAME                                   GENERATEDBYCONTROLLER   IGNITIONVERSION   AGE
+99-controlplane-chrony-configuration                           2.2.0             42s
+99-worker-chrony-configuration                                 2.2.0             43s
 ```
 
 # Example Vars file
diff --git a/tasks/generate_ssh_keys.yaml b/tasks/generate_ssh_keys.yaml
index 5cfaddd..430f66b 100644
--- a/tasks/generate_ssh_keys.yaml
+++ b/tasks/generate_ssh_keys.yaml
@@ -24,7 +24,7 @@
       Host {{ item.name }}.{{ dns.clusterid }}.{{ dns.domain }}
         User core
         IdentityFile {{ ansible_env.HOME }}/.ssh/helper_rsa
-  loop: "{{ masters }}"
+  loop: "{{ controlplane_nodes }}"
 
 - blockinfile:
     path: "{{ ansible_env.HOME }}/.ssh/config"
diff --git a/tasks/main.yml b/tasks/main.yml
index e470ac0..4156e3a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -267,12 +267,12 @@
           - restart tftp
         when: bootstrap is defined
 
-      - name: Set the master specific tftp files
+      - name: Set the control plane specific tftp files
         template:
-          src: ../templates/pxe-master.j2
+          src: ../templates/pxe-controlplane.j2
           dest: "/var/lib/tftpboot/pxelinux.cfg/01-{{ item.macaddr | regex_replace (':', '-')}}"
           mode: 0555
-        with_items: "{{ masters | lower }}"
+        with_items: "{{ controlplane_nodes | lower }}"
         notify:
           - restart tftp
 
@@ -324,12 +324,12 @@
         notify:
           - restart tftp
 
-      - name: Set the master specific tftp files
+      - name: Set the control plane specific tftp files
         template:
-          src: ../templates/grub2-master.j2
+          src: ../templates/grub2-controlplane.j2
           dest: "/var/lib/tftpboot/grub2/grub.cfg-01-{{ item.macaddr | regex_replace (':', '-')}}"
           mode: 0555
-        with_items: "{{ masters | lower }}"
+        with_items: "{{ controlplane_nodes | lower }}"
         notify:
           - restart tftp
 
@@ -371,12 +371,12 @@
         include_tasks: generate_grub.yml
         when: bootstrap is defined
 
-      - name: generate grub entry (masters)
+      - name: generate grub entry (control plane)
         vars:
-          role: master
+          role: controlplane
           mac: "{{ item.macaddr }}"
         include_tasks: generate_grub.yml
-        with_items: "{{ masters }}"
+        with_items: "{{ controlplane_nodes }}"
 
       - name: generate grub entry (workers)
         vars:
@@ -513,7 +513,7 @@
         src: ../templates/chrony-machineconfig.j2
         dest: "{{ machineconfig_path }}/99-{{item}}-chrony-configuration.yaml"
       loop:
-        - master
+        - controlplane
     - name: Generate Chrony machineconfig
       template:
         src: ../templates/chrony-machineconfig.j2
diff --git a/tasks/validate_host_names.yaml b/tasks/validate_host_names.yaml
index d627293..5d12978 100644
--- a/tasks/validate_host_names.yaml
+++ b/tasks/validate_host_names.yaml
@@ -6,5 +6,5 @@
   - "{{ dns.domain }}"
   - "{{ helper.name }}"
   - "{{ bootstrap.name | default('') }}"
-  - "{{ masters }}"
+  - "{{ controlplane_nodes }}"
   - "{{ workers | default('') }}"
diff --git a/templates/checker.sh.j2 b/templates/checker.sh.j2
index d63e998..e03ce91 100644
--- a/templates/checker.sh.j2
+++ b/templates/checker.sh.j2
@@ -7,21 +7,21 @@
 ##
 show_help () {
 echo "Usage:"
-echo "$(basename $0) {dns-masters|dns-workers|dns-etcd|dns-other|local-registry-info|install-info|haproxy|services|nfs-info}"
+echo "$(basename $0) {dns-controlplane-nodes|dns-workers|dns-etcd|dns-other|local-registry-info|install-info|haproxy|services|nfs-info}"
 echo ""
 }
 ##
-dns-masters () {
-echo "======================"
-echo "DNS Config for Masters"
-echo "======================"
+dns-controlplane-nodes () {
+echo "=================================="
+echo "DNS Config for Control Plane Nodes"
+echo "=================================="
 echo ""
-egrep --color=none -A {{ (masters | length) + 1 }} '^; Create entries for the master hosts' /var/named/zonefile.db
+egrep --color=none -A {{ (controlplane_nodes | length) + 1 }} '^; Create entries for the control plane hosts' /var/named/zonefile.db
 echo ""
-echo "======================"
-echo "DNS Lookup for Masters"
-echo "======================"
-{% for m in masters %}
+echo "=================================="
+echo "DNS Lookup for Control Plane Nodes"
+echo "=================================="
+{% for m in controlplane_nodes %}
 echo ""
 echo "{{ m.name | lower }}.{{ dns.clusterid }}.{{ dns.domain | lower }}"
 echo "-------------------------------------------------"
@@ -211,8 +211,8 @@ fi
 ##################################################
 
 case "$1" in
-  dns-masters)
-    dns-masters
+  dns-controlplane-nodes)
+    dns-controlplane-nodes
     ;;
   dns-workers)
     dns-workers
diff --git a/templates/default.j2 b/templates/default.j2
index 5bec4c4..7842cf0 100644
--- a/templates/default.j2
+++ b/templates/default.j2
@@ -10,7 +10,7 @@ default menu.c32
  label 2  
  menu label ^2) Install Master Node
  kernel rhcos/kernel
- append initrd=rhcos/initramfs.img nomodeset rd.neednet=1 ip=dhcp coreos.inst=yes coreos.inst.install_dev={{ disk }} {% if "metal" in ocp_bios %} coreos.inst.image_url=http://{{ helper.ipaddr }}:8080/install/bios.raw.gz {% elif "rootfs" in ocp_bios %} coreos.live.rootfs_url=http://{{ helper.ipaddr }}:8080/install/rootfs.img {% else %} coreos.UNKNOWN.CONFIG=you_messed_up {% endif %} coreos.inst.ignition_url=http://{{ helper.ipaddr }}:8080/ignition/master.ign
+ append initrd=rhcos/initramfs.img nomodeset rd.neednet=1 ip=dhcp coreos.inst=yes coreos.inst.install_dev={{ disk }} {% if "metal" in ocp_bios %} coreos.inst.image_url=http://{{ helper.ipaddr }}:8080/install/bios.raw.gz {% elif "rootfs" in ocp_bios %} coreos.live.rootfs_url=http://{{ helper.ipaddr }}:8080/install/rootfs.img {% else %} coreos.UNKNOWN.CONFIG=you_messed_up {% endif %} coreos.inst.ignition_url=http://{{ helper.ipaddr }}:8080/ignition/controlplane.ign
  label 3  
  menu label ^3) Install Worker Node
  kernel rhcos/kernel
diff --git a/templates/dhcpd-uefi.conf.j2 b/templates/dhcpd-uefi.conf.j2
index 992a085..023e64a 100644
--- a/templates/dhcpd-uefi.conf.j2
+++ b/templates/dhcpd-uefi.conf.j2
@@ -47,7 +47,7 @@ subnet {{ dhcp.ipid }} netmask {{ dhcp.netmaskid }} {
 {% if bootstrap is defined %}
     host {{ bootstrap.name | lower }} { hardware ethernet {{ bootstrap.macaddr }}; fixed-address {{ bootstrap.ipaddr }}; }
 {% endif %}
-{% for m in masters %}
+{% for m in controlplane_nodes %}
     host {{ m.name | lower }} { hardware ethernet {{ m.macaddr }}; fixed-address {{ m.ipaddr }}; }
 {% endfor %}
 {% if workers is defined %}
diff --git a/templates/dhcpd.conf.j2 b/templates/dhcpd.conf.j2
index 785dc99..682c391 100644
--- a/templates/dhcpd.conf.j2
+++ b/templates/dhcpd.conf.j2
@@ -23,7 +23,7 @@ max-lease-time 14400;
 {% if bootstrap is defined %}
         host {{ bootstrap.name | lower }} { hardware ethernet {{ bootstrap.macaddr }}; fixed-address {{ bootstrap.ipaddr }}; }
 {% endif %}
-{% for m in masters %}
+{% for m in controlplane_nodes %}
         host {{ m.name | lower }} { hardware ethernet {{ m.macaddr }}; fixed-address {{ m.ipaddr }}; }
 {% endfor %}
 {% if workers is defined %}
diff --git a/templates/grub2-master.j2 b/templates/grub2-controlplane.j2
similarity index 95%
rename from templates/grub2-master.j2
rename to templates/grub2-controlplane.j2
index 65d50f5..3c15d38 100644
--- a/templates/grub2-master.j2
+++ b/templates/grub2-controlplane.j2
@@ -12,6 +12,6 @@ set default=0
 set timeout=10
 
 menuentry 'Install Master Node' {
-  linuxefi rhcos/kernel initrd=rhcos/initramfs.img nomodeset rd.neednet=1 ip={{ ipconfig }} coreos.inst=yes coreos.inst.install_dev={{ disk }} {% if "metal" in ocp_bios %} coreos.inst.image_url=http://{{ helper.ipaddr }}:8080/install/bios.raw.gz {% elif "rootfs" in ocp_bios %} coreos.live.rootfs_url=http://{{ helper.ipaddr }}:8080/install/rootfs.img {% else %} coreos.UNKNOWN.CONFIG=you_messed_up {% endif %} coreos.inst.ignition_url=http://{{ helper.ipaddr }}:8080/ignition/master.ign
+  linuxefi rhcos/kernel initrd=rhcos/initramfs.img nomodeset rd.neednet=1 ip={{ ipconfig }} coreos.inst=yes coreos.inst.install_dev={{ disk }} {% if "metal" in ocp_bios %} coreos.inst.image_url=http://{{ helper.ipaddr }}:8080/install/bios.raw.gz {% elif "rootfs" in ocp_bios %} coreos.live.rootfs_url=http://{{ helper.ipaddr }}:8080/install/rootfs.img {% else %} coreos.UNKNOWN.CONFIG=you_messed_up {% endif %} coreos.inst.ignition_url=http://{{ helper.ipaddr }}:8080/ignition/controlplane.ign
   initrdefi rhcos/initramfs.img
 }
diff --git a/templates/haproxy.cfg.j2 b/templates/haproxy.cfg.j2
index bf92a8f..14dbb9c 100644
--- a/templates/haproxy.cfg.j2
+++ b/templates/haproxy.cfg.j2
@@ -85,7 +85,7 @@ backend openshift-api-server
 {% if bootstrap is defined %}
     server {{ bootstrap.name | lower }} {{ bootstrap.ipaddr }}:6443 check
 {% endif %}
-{% for m in masters %}
+{% for m in controlplane_nodes %}
     server {{ m.name | lower }} {{ m.ipaddr }}:6443 check
 {% endfor %}
 {% endif %}
@@ -101,7 +101,7 @@ backend machine-config-server
 {% if bootstrap is defined %}
     server {{ bootstrap.name | lower }} {{ bootstrap.ipaddr }}:22623 check
 {% endif %}
-{% for m in masters %}
+{% for m in controlplane_nodes %}
     server {{ m.name | lower }} {{ m.ipaddr }}:22623 check
 {% endfor %}
 {% endif %}
@@ -127,7 +127,7 @@ backend ingress-http
     server {{ w.name | lower }}-http-router{{ loop.index0 }} {{ w.ipaddr }}:80 check
 {% endfor %}
 {% else %}
-{% for m in masters %}
+{% for m in controlplane_nodes %}
     server {{ m.name | lower }}-http-router{{ loop.index0 }} {{ m.ipaddr }}:80 check
 {% endfor %}
 {% endif %}
@@ -154,7 +154,7 @@ backend ingress-https
     server {{ w.name | lower }}-https-router{{ loop.index0 }} {{ w.ipaddr }}:443 check
 {% endfor %}
 {% else %}
-{% for m in masters %}
+{% for m in controlplane_nodes %}
     server {{ m.name | lower }}-https-router{{ loop.index0 }} {{ m.ipaddr }}:443 check
 {% endfor %}
 {% endif %}
diff --git a/templates/pxe-master.j2 b/templates/pxe-controlplane.j2
similarity index 97%
rename from templates/pxe-master.j2
rename to templates/pxe-controlplane.j2
index ca9b9b6..0090011 100644
--- a/templates/pxe-master.j2
+++ b/templates/pxe-controlplane.j2
@@ -17,4 +17,4 @@ default menu.c32
  menu label ^1) Install Master Node
  menu default
  kernel rhcos/kernel
- append initrd=rhcos/initramfs.img nomodeset rd.neednet=1 ip={{ ipconfig }} coreos.inst=yes coreos.inst.install_dev={{ disk }} {% if "metal" in ocp_bios %} coreos.inst.image_url=http://{{ helper.ipaddr }}:8080/install/bios.raw.gz {% elif "rootfs" in ocp_bios %} coreos.live.rootfs_url=http://{{ helper.ipaddr }}:8080/install/rootfs.img {% else %} coreos.UNKNOWN.CONFIG=you_messed_up {% endif %} coreos.inst.ignition_url=http://{{ helper.ipaddr }}:8080/ignition/master.ign
+ append initrd=rhcos/initramfs.img nomodeset rd.neednet=1 ip={{ ipconfig }} coreos.inst=yes coreos.inst.install_dev={{ disk }} {% if "metal" in ocp_bios %} coreos.inst.image_url=http://{{ helper.ipaddr }}:8080/install/bios.raw.gz {% elif "rootfs" in ocp_bios %} coreos.live.rootfs_url=http://{{ helper.ipaddr }}:8080/install/rootfs.img {% else %} coreos.UNKNOWN.CONFIG=you_messed_up {% endif %} coreos.inst.ignition_url=http://{{ helper.ipaddr }}:8080/ignition/controlplane.ign
diff --git a/templates/reverse.j2 b/templates/reverse.j2
index e61c6cb..4857c5e 100644
--- a/templates/reverse.j2
+++ b/templates/reverse.j2
@@ -11,7 +11,7 @@ $TTL 1W
 {{ helper.ipaddr.split('.')[3] }}       IN      PTR     helper.{{ dns.clusterid }}.{{ dns.domain }}.
 
 {% if not ipi %}
-{% for m in masters %}
+{% for m in controlplane_nodes %}
 {{ m.ipaddr.split('.')[3] }}	IN	PTR	{{ m.name | lower }}.{{ dns.clusterid }}.{{ dns.domain | lower }}.
 {% endfor %}
 ;
diff --git a/templates/zonefile.j2 b/templates/zonefile.j2
index 735c0d1..b8a35d7 100644
--- a/templates/zonefile.j2
+++ b/templates/zonefile.j2
@@ -47,8 +47,8 @@ registry	IN	A	{{ helper.ipaddr }}
 {{ bootstrap.name | lower }}	IN	A	{{ bootstrap.ipaddr }}
 ;
 {% endif %}
-; Create entries for the master hosts
-{% for m in masters %}
+; Create entries for the control plane hosts
+{% for m in controlplane_nodes %}
 {{ m.name | lower }}		IN	A	{{ m.ipaddr }}
 {% endfor %}
 ;
@@ -59,13 +59,13 @@ registry	IN	A	{{ helper.ipaddr }}
 {% endfor %}
 {% endif %}
 ;
-; The ETCd cluster lives on the masters...so point these to the IP of the masters
-{% for m in masters %}
+; The ETCd cluster lives on the control plane nodes...so point these to the IP of the control plane nodes
+{% for m in controlplane_nodes %}
 etcd-{{ loop.index0 }}	IN	A	{{ m.ipaddr }}
 {% endfor %}
 ;
 ; The SRV records are IMPORTANT....make sure you get these right...note the trailing dot at the end...
-{% for m in masters %}
+{% for m in controlplane_nodes %}
 _etcd-server-ssl._tcp	IN	SRV	0 10 2380 etcd-{{ loop.index0 }}.{{ dns.clusterid }}.{{ dns.domain | lower }}.
 {% endfor %}
 {% endif %}

From ad9419315a76594b4f014f3f2bb968269f20a908 Mon Sep 17 00:00:00 2001
From: Ryan Holmes <ryan@semlohsemaj.com>
Date: Sat, 12 Feb 2022 08:34:36 -0600
Subject: [PATCH 2/2] change back to mastersSchedulable

---
 docs/bmquickstart-static.md | 6 +++---
 docs/bmquickstart.md        | 6 +++---
 docs/quickstart-powervm.md  | 6 +++---
 docs/quickstart-ppc64le.md  | 6 +++---
 docs/quickstart-static.md   | 6 +++---
 docs/quickstart.md          | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/bmquickstart-static.md b/docs/bmquickstart-static.md
index f6fd5af..f35930c 100644
--- a/docs/bmquickstart-static.md
+++ b/docs/bmquickstart-static.md
@@ -139,12 +139,12 @@ Create the installation manifests
 openshift-install create manifests
 ```
 
-Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
+Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
 
 > :rotating_light: Skip this step if you're installing a compact cluster
 
 ```shell
-$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
+$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
 ```
 
 It should look something like this after you edit it.
@@ -157,7 +157,7 @@ metadata:
   creationTimestamp: null
   name: cluster
 spec:
-  controlplaneSchedulable: false
+  mastersSchedulable: false
   policy:
     name: ""
 status: {}
diff --git a/docs/bmquickstart.md b/docs/bmquickstart.md
index 94d4889..d23bf34 100644
--- a/docs/bmquickstart.md
+++ b/docs/bmquickstart.md
@@ -141,12 +141,12 @@ Create the installation manifests
 openshift-install create manifests
 ```
 
-Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
+Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
 
 > :rotating_light: Skip this step if you're installing a compact cluster
 
 ```shell
-$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
+$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
 ```
 
 It should look something like this after you edit it.
@@ -159,7 +159,7 @@ metadata:
   creationTimestamp: null
   name: cluster
 spec:
-  controlplaneSchedulable: false
+  mastersSchedulable: false
   policy:
     name: ""
 status: {}
diff --git a/docs/quickstart-powervm.md b/docs/quickstart-powervm.md
index b839ce3..04de849 100644
--- a/docs/quickstart-powervm.md
+++ b/docs/quickstart-powervm.md
@@ -268,12 +268,12 @@ EOF
 openshift-install create manifests
 ```
 
-Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
+Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
 
 > :rotating_light: Skip this step if you're installing a compact cluster
 
 ```shell
-$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
+$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
 ```
 
 It should look something like this after you edit it.
@@ -286,7 +286,7 @@ metadata:
   creationTimestamp: null
   name: cluster
 spec:
-  controlplaneSchedulable: false
+  mastersSchedulable: false
   policy:
     name: ""
 status: {}
diff --git a/docs/quickstart-ppc64le.md b/docs/quickstart-ppc64le.md
index 674b2b7..023a597 100644
--- a/docs/quickstart-ppc64le.md
+++ b/docs/quickstart-ppc64le.md
@@ -268,12 +268,12 @@ Create the installation manifests
 openshift-install create manifests
 ```
 
-Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
+Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
 
 > :rotating_light: Skip this step if you're installing a compact cluster
 
 ```shell
-$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
+$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
 ```
 
 It should look something like this after you edit it.
@@ -286,7 +286,7 @@ metadata:
   creationTimestamp: null
   name: cluster
 spec:
-  controlplaneSchedulable: false
+  mastersSchedulable: false
   policy:
     name: ""
 status: {}
diff --git a/docs/quickstart-static.md b/docs/quickstart-static.md
index f4c13d4..c90906b 100644
--- a/docs/quickstart-static.md
+++ b/docs/quickstart-static.md
@@ -206,12 +206,12 @@ Create the installation manifests
 openshift-install create manifests
 ```
 
-Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
+Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
 
 > :rotating_light: Skip this step if you're installing a compact cluster
 
 ```shell
-$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
+$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
 ```
 
 It should look something like this after you edit it.
@@ -224,7 +224,7 @@ metadata:
   creationTimestamp: null
   name: cluster
 spec:
-  controlplaneSchedulable: false
+  mastersSchedulable: false
   policy:
     name: ""
 status: {}
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 7be77b0..6258787 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -254,12 +254,12 @@ Create the installation manifests
 openshift-install create manifests
 ```
 
-Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
+Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
 
 > :rotating_light: Skip this step if you're installing a compact cluster
 
 ```shell
-$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
+$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
 ```
 
 It should look something like this after you edit it.
@@ -272,7 +272,7 @@ metadata:
   creationTimestamp: null
   name: cluster
 spec:
-  controlplaneSchedulable: false
+  mastersSchedulable: false
   policy:
     name: ""
 status: {}