OSDOCS-17046: MACH-6 CQA split CPMS config assemblies

Author: jeana-redhat

_topic_maps/_topic_map.yml

@@ -2444,18 +2444,28 @@ Topics:
   - Name: Configuration options for control plane machines
     Dir: cpmso_provider_configurations
     Topics:
-    - Name: Control plane configuration options for Amazon Web Services
+    - Name: Changing control plane configuration options for Amazon Web Services
       File: cpmso-config-options-aws
-    - Name: Control plane configuration options for Microsoft Azure
+    - Name: Configuring Amazon Web Services features for control plane machines
+      File: cpmso-supported-features-aws
+    - Name: Changing control plane configuration options for Microsoft Azure
       File: cpmso-config-options-azure
-    - Name: Control plane configuration options for Google Cloud
+    - Name: Configuring Microsoft Azure features for control plane machines
+      File: cpmso-supported-features-azure
+    - Name: Changing control plane configuration options for Google Cloud
       File: cpmso-config-options-gcp
-    - Name: Control plane configuration options for Nutanix
+    - Name: Configuring Google Cloud features for control plane machines
+      File: cpmso-supported-features-gcp
+    - Name: Changing control plane configuration options for Nutanix
       File: cpmso-config-options-nutanix
-    - Name: Control plane configuration options for Red Hat OpenStack Platform
+    - Name: Changing control plane configuration options for Red Hat OpenStack Platform
       File: cpmso-config-options-openstack
-    - Name: Control plane configuration options for VMware vSphere
+    - Name: Configuring Red Hat OpenStack Platform features for control plane machines
+      File: cpmso-supported-features-openstack
+    - Name: Changing control plane configuration options for VMware vSphere
       File: cpmso-config-options-vsphere
+    - Name: Configuring VMware vSphere features for control plane machines
+      File: cpmso-supported-features-vsphere
   - Name: Control plane resiliency and recovery
     File: cpmso-resiliency
   - Name: Troubleshooting the control plane machine set

machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc

@@ -47,7 +47,7 @@ include::modules/machine-feature-aws-imds-options.adoc[leveloffset=+2]
 //This link is for a note that does not apply to TP clusters, reassess for Cluster API GA
 [role="_additional-resources"]
 .Additional resources
-* xref:../../../machine_configuration/mco-update-boot-images.adoc#mco-update-boot-images[Updated boot images]
+* xref:../../../machine_configuration/mco-update-boot-images.adoc#mco-update-boot-images[Boot image management]
 ////
 
 // Dedicated Instances configuration options

machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-aws.adoc

@@ -1,58 +1,27 @@
 :_mod-docs-content-type: ASSEMBLY
-[id="cpmso-config-options-aws"]
-= Control plane configuration options for Amazon Web Services
 include::_attributes/common-attributes.adoc[]
+[id="cpmso-config-options-aws"]
+= Changing control plane configuration options for {aws-full}
 :context: cpmso-config-options-aws
 
 toc::[]
 
-You can change the configuration of your {aws-first} control plane machines and enable features by updating values in the control plane machine set.
-When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured xref:../../../machine_management/control_plane_machine_management/cpmso-managing-machines.adoc#cpmso-feat-config-update_cpmso-managing-machines[update strategy].
+[role="_abstract"]
+You can update your control plane machines to reflect changes in your infrastructure or environment by editing values in the control plane machine set specification.
 
-[id="cpmso-sample-yaml-aws_{context}"]
-== Sample YAML for configuring {aws-full} clusters
+When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured update strategy.
+For more information, see "Updating the control plane configuration".
 
 The following example YAML snippets show provider specification and failure domain configurations for an {aws-short} cluster.
 
 //Sample AWS provider specification
-include::modules/cpmso-yaml-provider-spec-aws.adoc[leveloffset=+2]
+include::modules/cpmso-yaml-provider-spec-aws.adoc[leveloffset=+1]
 
 //Sample AWS failure domain configuration
-include::modules/cpmso-yaml-failure-domain-aws.adoc[leveloffset=+2]
-
-[id="cpmso-supported-features-aws_{context}"]
-== Enabling {aws-full} features for control plane machines
-
-You can enable features by updating values in the control plane machine set.
-
-//Restricting the API server to private (AWS control plane machine set version)
-include::modules/private-clusters-setting-api-private.adoc[leveloffset=+2]
-
-[role="_additional-resources"]
-.Additional resources
-* xref:../../../networking/ingress_load_balancing/configuring_ingress_cluster_traffic/nw-configuring-ingress-controller-endpoint-publishing-strategy.adoc#nw-ingresscontroller-change-internal_nw-configuring-ingress-controller-endpoint-publishing-strategy[Configuring the Ingress Controller endpoint publishing scope to Internal]
-
-//Selecting a larger Amazon Web Services instance type for control plane machines
-include::modules/cpms-changing-aws-instance-type.adoc[leveloffset=+2]
-
-//Assigning machines to placement groups by using machine sets
-include::modules/machineset-aws-existing-placement-group.adoc[leveloffset=+2]
-
-//Machine sets that enable the Amazon EC2 Instance Metadata Service
-include::modules/machineset-imds-options.adoc[leveloffset=+2]
+include::modules/cpmso-yaml-failure-domain-aws.adoc[leveloffset=+1]
 
+[id="additional-resources_{context}"]
 [role="_additional-resources"]
-.Additional resources
-* xref:../../../machine_configuration/mco-update-boot-images.adoc#mco-update-boot-images[Updated boot images]
-
-//Creating machines that use the Amazon EC2 Instance Metadata Service
-include::modules/machineset-creating-imds-options.adoc[leveloffset=+3]
-
-//Machine sets that deploy machines as Dedicated Instances
-include::modules/machineset-dedicated-instances.adoc[leveloffset=+2]
-
-//Creating Dedicated Instances by using machine sets
-include::modules/machineset-creating-dedicated-instances.adoc[leveloffset=+3]
-
-//Configuring Capacity Reservation by using machine sets
-include::modules/machineset-capacity-reservation.adoc[leveloffset=+2,tag=!compute]
+== Additional resources
+* xref:../../../machine_management/control_plane_machine_management/cpmso-managing-machines.adoc#cpmso-feat-config-update_cpmso-managing-machines[Updating the control plane configuration]
+* xref:../../../machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-supported-features-aws.adoc#cpmso-supported-features-aws[Configuring {aws-full} features for control plane machines]

machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-azure.adoc

@@ -1,74 +1,27 @@
 :_mod-docs-content-type: ASSEMBLY
-[id="cpmso-config-options-azure"]
-= Control plane configuration options for Microsoft Azure
 include::_attributes/common-attributes.adoc[]
+[id="cpmso-config-options-azure"]
+= Changing control plane configuration options for {azure-full}
 :context: cpmso-config-options-azure
 
 toc::[]
 
-You can change the configuration of your {azure-first} control plane machines and enable features by updating values in the control plane machine set.
-When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured xref:../../../machine_management/control_plane_machine_management/cpmso-managing-machines.adoc#cpmso-feat-config-update_cpmso-managing-machines[update strategy].
+[role="_abstract"]
+You can update your control plane machines to reflect changes in your infrastructure or environment by editing values in the control plane machine set specification.
 
-[id="cpmso-sample-yaml-azure_{context}"]
-== Sample YAML for configuring {azure-full} clusters
+When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured update strategy.
+For more information, see "Updating the control plane configuration".
 
 The following example YAML snippets show provider specification and failure domain configurations for an {azure-short} cluster.
 
 //Sample Azure provider specification
-include::modules/cpmso-yaml-provider-spec-azure.adoc[leveloffset=+2]
+include::modules/cpmso-yaml-provider-spec-azure.adoc[leveloffset=+1]
 
 //Sample Azure failure domain configuration
-include::modules/cpmso-yaml-failure-domain-azure.adoc[leveloffset=+2]
-
-[id="cpmso-supported-features-azure_{context}"]
-== Enabling {azure-full} features for control plane machines
-
-You can enable features by updating values in the control plane machine set.
-
-include::modules/private-clusters-setting-api-private.adoc[leveloffset=+2]
-
-[role="_additional-resources"]
-.Additional resources
-* xref:../../../networking/ingress_load_balancing/configuring_ingress_cluster_traffic/nw-configuring-ingress-controller-endpoint-publishing-strategy.adoc#nw-ingresscontroller-change-internal_nw-configuring-ingress-controller-endpoint-publishing-strategy[Configuring the Ingress Controller endpoint publishing scope to Internal]
-
-//Using the Azure Marketplace offering
-include::modules/installation-azure-marketplace-subscribe.adoc[leveloffset=+2]
-
-//Enabling Azure boot diagnostics
-include::modules/machineset-azure-boot-diagnostics.adoc[leveloffset=+2]
-
-//Machine sets that deploy machines on ultra disks as data disks
-include::modules/machineset-azure-ultra-disk.adoc[leveloffset=+2]
+include::modules/cpmso-yaml-failure-domain-azure.adoc[leveloffset=+1]
 
+[id="additional-resources_{context}"]
 [role="_additional-resources"]
-.Additional resources
-* link:https://docs.microsoft.com/en-us/azure/virtual-machines/disks-types#ultra-disks[{azure-full} ultra disks documentation]
-
-//Creating machines on ultra disks by using machine sets
-include::modules/machineset-creating-azure-ultra-disk.adoc[leveloffset=+3]
-
-//Troubleshooting resources for machine sets that enable ultra disks
-include::modules/machineset-troubleshooting-azure-ultra-disk.adoc[leveloffset=+3]
-
-//Enabling customer-managed encryption keys for a machine set
-include::modules/machineset-customer-managed-encryption-azure.adoc[leveloffset=+2]
-
-//Configuring trusted launch for Azure virtual machines by using machine sets
-include::modules/machineset-azure-trusted-launch.adoc[leveloffset=+2]
-
-//Configuring Azure confidential virtual machines by using machine sets
-include::modules/machineset-azure-confidential-vms.adoc[leveloffset=+2]
-
-//Configuring Capacity Reservation by using machine sets
-include::modules/machineset-capacity-reservation.adoc[leveloffset=+2,tag=!compute]
-
-// Accelerated Networking for Microsoft Azure VMs
-include::modules/machineset-azure-accelerated-networking.adoc[leveloffset=+2]
-
-//Not applicable for 4.12, possibly 4.13?
-//[role="_additional-resources"]
-//.Additional resources
-//*  xref:../../../installing/installing_azure/ipi/installing-azure-customizations.adoc#machineset-azure-enabling-accelerated-networking-new-install_installing-azure-customizations[Enabling Accelerated Networking during installation]
-
-// Enabling Accelerated Networking on an existing Microsoft Azure cluster
-include::modules/machineset-azure-enabling-accelerated-networking-existing.adoc[leveloffset=+3]
+== Additional resources
+* xref:../../../machine_management/control_plane_machine_management/cpmso-managing-machines.adoc#cpmso-feat-config-update_cpmso-managing-machines[Updating the control plane configuration]
+* xref:../../../machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-supported-features-azure.adoc#cpmso-supported-features-azure[Configuring {azure-full} features for control plane machines]

machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-gcp.adoc

@@ -1,47 +1,27 @@
 :_mod-docs-content-type: ASSEMBLY
 include::_attributes/common-attributes.adoc[]
 [id="cpmso-config-options-gcp"]
-= Control plane configuration options for {gcp-full}
+= Changing control plane configuration options for {gcp-full}
 :context: cpmso-config-options-gcp
 
 toc::[]
 
-You can change the configuration of your {gcp-first} control plane machines and enable features by updating values in the control plane machine set.
-When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured xref:../../../machine_management/control_plane_machine_management/cpmso-managing-machines.adoc#cpmso-feat-config-update_cpmso-managing-machines[update strategy].
+[role="_abstract"]
+You can update your control plane machines to reflect changes in your infrastructure or environment by editing values in the control plane machine set specification.
 
-[id="cpmso-sample-yaml-gcp_{context}"]
-== Sample YAML for configuring {gcp-full} clusters
+When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured update strategy.
+For more information, see "Updating the control plane configuration".
 
 The following example YAML snippets show provider specification and failure domain configurations for a {gcp-short} cluster.
 
 //Sample GCP provider specification
-include::modules/cpmso-yaml-provider-spec-gcp.adoc[leveloffset=+2]
+include::modules/cpmso-yaml-provider-spec-gcp.adoc[leveloffset=+1]
 
 //Sample GCP failure domain configuration
-include::modules/cpmso-yaml-failure-domain-gcp.adoc[leveloffset=+2]
-
-[id="cpmso-supported-features-gcp_{context}"]
-== Enabling {gcp-full} features for control plane machines
-
-You can enable features by updating values in the control plane machine set.
-
-//Note: GCP GPU features should be compatible with CPMS, but dev cannot think of a use case. Leaving them out to keep things less cluttered. If a customer use case emerges, we can just add the necessary modules in here.
-
-//Configuring persistent disk types by using machine sets
-include::modules/machineset-gcp-pd-disk-types.adoc[leveloffset=+2]
-
-//Configuring Confidential VM by using machine sets
-include::modules/machineset-gcp-confidential-vm.adoc[leveloffset=+2]
-
-//Configuring Shielded VM options by using machine sets
-include::modules/machineset-gcp-shielded-vms.adoc[leveloffset=+2]
+include::modules/cpmso-yaml-failure-domain-gcp.adoc[leveloffset=+1]
 
+[id="additional-resources_{context}"]
 [role="_additional-resources"]
-.Additional resources
-* link:https://cloud.google.com/compute/shielded-vm/docs/shielded-vm[What is Shielded VM?]
-** link:https://cloud.google.com/compute/shielded-vm/docs/shielded-vm#secure-boot[Secure Boot]
-** link:https://cloud.google.com/compute/shielded-vm/docs/shielded-vm#vtpm[Virtual Trusted Platform Module (vTPM)]
-** link:https://cloud.google.com/compute/shielded-vm/docs/shielded-vm#integrity-monitoring[Integrity monitoring]
-
-//Enabling customer-managed encryption keys for a machine set
-include::modules/machineset-gcp-enabling-customer-managed-encryption.adoc[leveloffset=+2]
+== Additional resources
+* xref:../../../machine_management/control_plane_machine_management/cpmso-managing-machines.adoc#cpmso-feat-config-update_cpmso-managing-machines[Updating the control plane configuration]
+* xref:../../../machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-supported-features-gcp.adoc#cpmso-supported-features-gcp[Configuring {gcp-full} features for control plane machines]

machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-nutanix.adoc

@@ -1,25 +1,27 @@
 :_mod-docs-content-type: ASSEMBLY
-[id="cpmso-config-options-nutanix"]
-= Control plane configuration options for Nutanix
 include::_attributes/common-attributes.adoc[]
+[id="cpmso-config-options-nutanix"]
+= Changing control plane configuration options for Nutanix
 :context: cpmso-config-options-nutanix
 
 toc::[]
 
-You can change the configuration of your Nutanix control plane machines by updating values in the control plane machine set.
-When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured xref:../../../machine_management/control_plane_machine_management/cpmso-managing-machines.adoc#cpmso-feat-config-update_cpmso-managing-machines[update strategy].
+[role="_abstract"]
+You can update your control plane machines to reflect changes in your infrastructure or environment by editing values in the control plane machine set specification.
 
-[id="cpmso-sample-yaml-nutanix_{context}"]
-== Sample YAML for configuring Nutanix clusters
+When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured update strategy.
+For more information, see "Updating the control plane configuration".
 
-The following example YAML snippet shows a provider specification configuration for a Nutanix cluster.
+The following example YAML snippets show provider specification and failure domain configurations for a Nutanix cluster.
 
 //Sample Nutanix provider specification
-include::modules/cpmso-yaml-provider-spec-nutanix.adoc[leveloffset=+2]
+include::modules/cpmso-yaml-provider-spec-nutanix.adoc[leveloffset=+1]
 
 //Failure domains for Nutanix clusters
-include::modules/mapi-failure-domain-nutanix.adoc[leveloffset=+2]
+include::modules/mapi-failure-domain-nutanix.adoc[leveloffset=+1]
 
+[id="additional-resources_{context}"]
 [role="_additional-resources"]
-.Additional resources
+== Additional resources
+* xref:../../../machine_management/control_plane_machine_management/cpmso-managing-machines.adoc#cpmso-feat-config-update_cpmso-managing-machines[Updating the control plane configuration]
 * xref:../../../installing/installing_nutanix/nutanix-failure-domains.adoc#nutanix-failure-domains-adding-to-existing-cluster_nutanix-failure-domains[Adding failure domains to an existing Nutanix cluster]