Updated control plane module

Author: bscott-rh

installing/installing_gcp/installing-gcp-user-infra-vpc.adoc

@@ -143,7 +143,7 @@ include::modules/installation-infrastructure-manager-bootstrap.adoc[leveloffset=
 
 include::modules/installation-creating-gcp-control-plane.adoc[leveloffset=+1]
 
-include::modules/installation-deployment-manager-control-plane.adoc[leveloffset=+2]
+include::modules/installation-infrastructure-manager-control-plane.adoc[leveloffset=+2]
 
 // Removing bootstrap resources in GCP
 include::modules/installation-gcp-user-infra-wait-for-bootstrap.adoc[leveloffset=+1]

installing/installing_gcp/installing-gcp-user-infra.adoc

@@ -148,7 +148,7 @@ include::modules/installation-infrastructure-manager-bootstrap.adoc[leveloffset=
 
 include::modules/installation-creating-gcp-control-plane.adoc[leveloffset=+1]
 
-include::modules/installation-deployment-manager-control-plane.adoc[leveloffset=+2]
+include::modules/installation-infrastructure-manager-control-plane.adoc[leveloffset=+2]
 
 // Removing bootstrap resources in GCP
 include::modules/installation-gcp-user-infra-wait-for-bootstrap.adoc[leveloffset=+1]

installing/installing_gcp/installing-restricted-networks-gcp.adoc

@@ -147,7 +147,7 @@ include::modules/installation-infrastructure-manager-bootstrap.adoc[leveloffset=
 
 include::modules/installation-creating-gcp-control-plane.adoc[leveloffset=+1]
 
-include::modules/installation-deployment-manager-control-plane.adoc[leveloffset=+2]
+include::modules/installation-infrastructure-manager-control-plane.adoc[leveloffset=+2]
 
 include::modules/installation-gcp-user-infra-wait-for-bootstrap.adoc[leveloffset=+1]
 

modules/installation-creating-gcp-bootstrap.adoc

@@ -25,7 +25,7 @@ If you do not use the provided Deployment Manager template to create your bootst
 
 . Copy the template from the *Infrastructure Manager template for the bootstrap machine* section of this topic and save it as `04_bootstrap.tf` in a folder called `04_bootstrap` on your computer. This template describes the bootstrap machine that your cluster requires.
 
-.. You can edit the `04_bootstrap.tf` file to add additional tags to the bootstrap machine, by modifying the existing `tags` stanza as follows:
+** You can edit the `04_bootstrap.tf` file to add additional tags to the bootstrap machine, by modifying the existing `tags` stanza as follows:
 +
 [source,bash]
 ----

modules/installation-creating-gcp-control-plane.adoc

@@ -4,122 +4,112 @@
 // * installing/installing_gcp/installing-restricted-networks-gcp.adoc
 // * installing/installing_gcp/installing-gcp-user-infra-vpc.adoc
 
-ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
-:shared-vpc:
-endif::[]
-
 :_mod-docs-content-type: PROCEDURE
 [id="installation-creating-gcp-control-plane_{context}"]
 = Creating the control plane machines in {gcp-short}
 
-You must create the control plane machines in {gcp-first} for
-your cluster to use. One way to create these machines is to modify the
-provided Deployment Manager template.
+[role="_abstract"]
+You must create the control plane machines in {gcp-first} for your cluster to use. One way to create these machines is to modify the provided Infrastructure Manager template.
 
 [NOTE]
 ====
-If you do not use the provided Deployment Manager template to create your
-control plane machines, you must review the provided information and manually
-create the infrastructure. If your cluster does not initialize correctly, you
-might have to contact Red Hat support with your installation logs.
+If you do not use the provided template to create your control plane machines, you must review the provided information and manually create the infrastructure. If your cluster does not initialize correctly, you might have to contact Red Hat support with your installation logs.
 ====
 
 .Prerequisites
 
-* Ensure you defined the variables in the _Exporting common variables_, _Creating load balancers in {gcp-short}_, _Creating IAM roles in {gcp-short}_, and _Creating the bootstrap machine in {gcp-short}_ sections.
-* Create the bootstrap machine.
+* You defined the variables in the _Exporting common variables_, _Creating load balancers in {gcp-short}_, _Creating IAM roles in {gcp-short}_, and _Creating the bootstrap machine in {gcp-short}_ sections.
+* You created the bootstrap machine.
+* You created the Ignition configuration files.
 
 .Procedure
 
-. Copy the template from the *Deployment Manager template for control plane machines*
-section of this topic and save it as `05_control_plane.py` on your computer.
-This template describes the control plane machines that your cluster requires.
+. Copy the template from the *Infrastructure Manager template for control plane machines* section of this topic and save it as `05_control_plane.tf` in a folder called `05_control_plane` on your computer. This template describes the control plane machines that your cluster requires.
+
+** You can edit the `05_control_plane.tf` file to add additional tags to the control plane machines, by modifying the existing `tags` stanza. The following example adds a custom tag to the first control plane machine, which is named `master_0`:
++
+[source,bash]
+----
+resource "google_compute_instance" "master_0" {
+# ...
+  tags = [
+    "${var.infra_id}-master"
+    "custom_tag_example"
+  ]
+# ...
+}
+----
 
-. Export the following variable required by the resource definition:
+. Copy the `master.ign` file from your installation directory into the `05_control_plane` folder by running the following command:
 +
 [source,terminal]
 ----
-$ export MASTER_IGNITION=`cat <installation_directory>/master.ign`
+$ cp <installation_directory>/master.ign 05_control_plane/master.ign
 ----
+`<installation_directory>` specifies the directory where you created the Ignition configuration files.
 
-. Create a `05_control_plane.yaml` resource definition file:
+. Create the control plane deployment by running the following command:
 +
 [source,terminal]
 ----
-$ cat <<EOF >05_control_plane.yaml
-imports:
-- path: 05_control_plane.py
-
-resources:
-- name: cluster-control-plane
-  type: 05_control_plane.py
-  properties:
-    infra_id: '${INFRA_ID}' <1>
-    zones: <2>
-    - '${ZONE_0}'
-    - '${ZONE_1}'
-    - '${ZONE_2}'
-
-    control_subnet: '${CONTROL_SUBNET}' <3>
-    image: '${CLUSTER_IMAGE}' <4>
-    machine_type: 'n1-standard-4' <5>
-    root_volume_size: '128'
-    service_account_email: '${MASTER_SERVICE_ACCOUNT}' <6>
-
-    ignition: '${MASTER_IGNITION}' <7>
-EOF
-----
-<1> `infra_id` is the `INFRA_ID` infrastructure name from the extraction step.
-<2> `zones` are the zones to deploy the control plane instances into, for example `us-central1-a`, `us-central1-b`, and `us-central1-c`.
-<3> `control_subnet` is the `selfLink` URL to the control subnet.
-<4> `image` is the `selfLink` URL to the {op-system} image.
-<5> `machine_type` is the machine type of the instance, for example `n1-standard-4`.
-<6> `service_account_email` is the email address for the master service account that you created.
-<7> `ignition` is the contents of the `master.ign` file.
-
-. Create the deployment by using the `gcloud` CLI:
+$ gcloud infra-manager deployments apply <control_plane_deployment> \
+  --location=${REGION} \
+  --project=${PROJECT_NAME} \
+  --local-source=./05_control_plane \
+  --input-values=infra_id=${INFRA_ID},project=${PROJECT_NAME},region=${REGION},zone_0=${ZONE_0},zone_1=${ZONE_1},zone_2=${ZONE_2},subnet=${CONTROL_SUBNET},image=${CLUSTER_IMAGE},service_account_email=${MASTER_SERVICE_ACCOUNT} \
+  --service-account=${INSTALL_SERVICE_ACCOUNT}
+----
+`<control_plane_deployment>` specifies the name of the control plane deployment.
+
+. Delete the temporary ignition file from the `05_control_plane` folder by running the following command:
 +
 [source,terminal]
 ----
-$ gcloud deployment-manager deployments create ${INFRA_ID}-control-plane --config 05_control_plane.yaml
+$ rm 05_control_plane/master.ign
 ----
 
-. The templates do not manage load balancer membership due to limitations of Deployment
-Manager, so you must add the control plane machines manually.
-** Run the following commands to add the control plane machines to the appropriate instance groups:
+. The templates do not manage load balancer membership due to limitations of Infrastructure Manager, so you must add the control plane machines manually.
+
+.. Add the first control plane machine to an internal load balancer instance group by running the following command:
 +
 [source,terminal]
 ----
 $ gcloud compute instance-groups unmanaged add-instances ${INFRA_ID}-master-${ZONE_0}-ig --zone=${ZONE_0} --instances=${INFRA_ID}-master-0
 ----
+
+.. Add the second control plane machine to an internal load balancer instance group by running the following command:
 +
 [source,terminal]
 ----
 $ gcloud compute instance-groups unmanaged add-instances ${INFRA_ID}-master-${ZONE_1}-ig --zone=${ZONE_1} --instances=${INFRA_ID}-master-1
 ----
+
+.. Add the third control plane machine to an internal load balancer instance group by running the following command:
 +
 [source,terminal]
 ----
 $ gcloud compute instance-groups unmanaged add-instances ${INFRA_ID}-master-${ZONE_2}-ig --zone=${ZONE_2} --instances=${INFRA_ID}-master-2
 ----
 
-** For an external cluster, you must also run the following commands to add the control plane machines to the target pools:
+. For an external cluster, you must also add the control plane machines to external load balancer target pools.
+
+.. Add the first control plane machine to an external load balancer pool by running the following command:
 +
 [source,terminal]
 ----
 $ gcloud compute target-pools add-instances ${INFRA_ID}-api-target-pool --instances-zone="${ZONE_0}" --instances=${INFRA_ID}-master-0
 ----
+
+.. Add the first control plane machine to an external load balancer pool by running the following command:
 +
 [source,terminal]
 ----
 $ gcloud compute target-pools add-instances ${INFRA_ID}-api-target-pool --instances-zone="${ZONE_1}" --instances=${INFRA_ID}-master-1
 ----
+
+.. Add the first control plane machine to an external load balancer pool by running the following command:
 +
 [source,terminal]
 ----
 $ gcloud compute target-pools add-instances ${INFRA_ID}-api-target-pool --instances-zone="${ZONE_2}" --instances=${INFRA_ID}-master-2
-----
-
-ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
-:!shared-vpc:
-endif::[]
+----

modules/installation-deployment-manager-control-plane.adoc

@@ -0,0 +1,20 @@
+// Module included in the following assemblies:
+//
+// * installing/installing_gcp/installing-gcp-user-infra.adoc
+// * installing/installing_gcp/installing-restricted-networks-gcp.adoc
+
+:_mod-docs-content-type: REFERENCE
+[id="installation-infrastructure-manager-control-plane_{context}"]
+= Infrastructure Manager template for control plane machines
+
+[role="_abstract"]
+You can use the following Infrastructure Manager template to deploy the control plane machines that you need for your {product-title} cluster:
+
+.`05_control_plane.tf` Infrastructure Manager template
+[%collapsible]
+====
+[source,python]
+----
+include::https://raw.githubusercontent.com/openshift/installer/release-4.22/upi/gcp/05_control_plane/05_control_plane.tf[]
+----
+====