Merge pull request #52341 from slovern/TELCODOCS-783

TELCODOCS-783 - Optional Capabilties - CNF-5376 Leverage Composable Op…

Author: jldohmann

modules/install-sno-generating-the-install-iso-manually.adoc

@@ -109,6 +109,13 @@ bootstrapInPlace:
 pullSecret: '<pull_secret>' <8>
 sshKey: |
   <ssh_key> <9>
+capabilities:
+  baselineCapabilitySet: v4.11 <10>
+  additionalEnabledCapabilities: <11>
+  - CSISnapshot
+  - Insights
+  - Storage
+
 ----
 <1> Add the cluster domain name.
 <2> Set the `compute` replicas to `0`. This makes the control plane node schedulable.
@@ -119,6 +126,23 @@ sshKey: |
 <7> Set the path to the installation disk drive, for example, `/dev/disk/by-id/wwn-0x64cd98f04fde100024684cf3034da5c2`.
 <8> Copy the {cluster-manager-url-pull} and add the contents to this configuration setting.
 <9> Add the public SSH key from the administration host so that you can log in to the cluster after installation.
+<10> Activate a predefined set of cluster capabilities.
+<11> Add the additional cluster capabilities you want to enable here.
++
+[NOTE]
+====
+The following sets of cluster capabilities are predefined:
+
+`None`:: No optional capabilities are enabled.
+`v4.11`:: Includes `baremetal`, `marketplace`, and `openshift-samples`.
+`v4.12`:: Includes all capabilities from `v4.11`, and `Console`, `Insights`, `Storage`, `CSISnapshot`.
+`vCurrent`:: Enables the recommended set of optional capabilities.
+====
++
+[IMPORTANT]
+====
+Removing a capability from a cluster alters the behavior of that cluster and could require you to provide alternative methods to perform the functions associated with that capability. For example, if you remove the storage capability, you need to provide your own storage to, for example, support metrics persistence.
+====
 
 . Generate {product-title} assets by running the following commands:
 +

modules/installation-bare-metal-config-yaml.adoc

@@ -205,6 +205,16 @@ ifndef::ibm-z,ibm-z-kvm[]
 endif::ibm-z,ibm-z-kvm[]
 endif::openshift-origin[]
 endif::restricted[]
+ifndef::ibm-z,ibm-z-kvm,ibm-power,agnostic,rhv[]
+ifndef::restricted[]
+capabilities:
+  baselineCapabilitySet: v4.11 <14>
+  additionalEnabledCapabilities: <15>
+  - CSISnapshot
+  - Insights
+  - Storage
+endif::restricted[]
+endif::ibm-z,ibm-z-kvm,ibm-power,agnostic,rhv[]
 ----
 <1> The base domain of the cluster. All DNS records must be sub-domains of this base and include the cluster name.
 <2> The `controlPlane` section is a single mapping, but the `compute` section is a sequence of mappings. To meet the requirements of the different data structures, the first line of the `compute` section must begin with a hyphen, `-`, and the first line of the `controlPlane` section must not. Only one control plane pool is used.
@@ -291,14 +301,35 @@ endif::restricted[]
 ifndef::openshift-origin[]
 <13> The SSH public key for the `core` user in {op-system-first}.
 endif::openshift-origin[]
-ifdef::openshift-origin[]
-<12> The SSH public key for the `core` user in {op-system-first}.
-endif::openshift-origin[]
 +
 [NOTE]
 ====
 For production {product-title} clusters on which you want to perform installation debugging or disaster recovery, specify an SSH key that your `ssh-agent` process uses.
 ====
+ifndef::ibm-z,ibm-z-kvm,ibm-power,agnostic,rhv[]
+ifndef::restricted[]
+<14> Activate a predefined set of cluster capabilities.
+<15> Add the additional cluster capabilities you want to enable here.
++
+[NOTE]
+====
+The following sets of cluster capabilities are predefined:
+
+`None`:: All capabilities are disabled.
+`v4.11`:: Includes `baremetal`, `marketplace`, and `openshift-samples`.
+`v4.12`:: Includes all capabilities from `v4.11`, and `Console`, `Insights`, `Storage`, `CSISnapshot`.
+`vCurrent`:: All available capabilities are enabled.
+====
++
+[IMPORTANT]
+====
+Removing a capability from a cluster alters the behavior of that cluster and could require you to provide alternative methods to perform the functions associated with that capability. For example, if you remove the storage capability, you need to provide your own storage to, for example, support metrics persistence.
+====
+endif::restricted[]
+endif::ibm-z,ibm-z-kvm,ibm-power,agnostic,rhv[]
+ifdef::openshift-origin[]
+<12> The SSH public key for the `core` user in {op-system-first}.
+endif::openshift-origin[]
 ifdef::restricted[]
 ifndef::ibm-z,ibm-z-kvm[]
 ifndef::openshift-origin[]