Skip to content

Commit 675f6aa

Browse files
committed
OCPBUGS#4333 Removing capabilities stanza from bare metal sample yaml
1 parent 1449cfd commit 675f6aa

File tree

2 files changed

+1
-36
lines changed

2 files changed

+1
-36
lines changed

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,6 @@ bootstrapInPlace:
109109
pullSecret: '<pull_secret>' <8>
110110
sshKey: |
111111
<ssh_key> <9>
112-
capabilities:
113-
baselineCapabilitySet: v4.12 <10>
114-
additionalEnabledCapabilities: <11>
115-
- CSISnapshot
116-
- Insights
117-
- Storage
118-
119112
----
120113
<1> Add the cluster domain name.
121114
<2> Set the `compute` replicas to `0`. This makes the control plane node schedulable.
@@ -126,13 +119,6 @@ capabilities:
126119
<7> Set the path to the installation disk drive, for example, `/dev/disk/by-id/wwn-0x64cd98f04fde100024684cf3034da5c2`.
127120
<8> Copy the {cluster-manager-url-pull} and add the contents to this configuration setting.
128121
<9> Add the public SSH key from the administration host so that you can log in to the cluster after installation.
129-
<10> Activate a predefined set of cluster capabilities.
130-
<11> Add the additional cluster capabilities you want to enable here.
131-
+
132-
[IMPORTANT]
133-
====
134-
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.
135-
====
136122

137123
. Generate {product-title} assets by running the following commands:
138124
+

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

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ ifndef::ibm-z,ibm-z-kvm[]
178178
endif::ibm-z,ibm-z-kvm[]
179179
endif::openshift-origin[]
180180
ifdef::openshift-origin[]
181-
additionalTrustBundle: | <13>
181+
additionalTrustBundle: | <14>
182182
-----BEGIN CERTIFICATE-----
183183
ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
184184
-----END CERTIFICATE-----
@@ -200,16 +200,6 @@ ifndef::ibm-z,ibm-z-kvm[]
200200
endif::ibm-z,ibm-z-kvm[]
201201
endif::openshift-origin[]
202202
endif::restricted[]
203-
ifndef::ibm-z,ibm-z-kvm,ibm-power,agnostic,rhv[]
204-
ifndef::restricted[]
205-
capabilities:
206-
baselineCapabilitySet: v4.12 <15>
207-
additionalEnabledCapabilities: <16>
208-
- CSISnapshot
209-
- Insights
210-
- Storage
211-
endif::restricted[]
212-
endif::ibm-z,ibm-z-kvm,ibm-power,agnostic,rhv[]
213203
----
214204
<1> The base domain of the cluster. All DNS records must be sub-domains of this base and include the cluster name.
215205
<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.
@@ -302,17 +292,6 @@ endif::openshift-origin[]
302292
====
303293
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.
304294
====
305-
ifndef::ibm-z,ibm-z-kvm,ibm-power,agnostic,rhv[]
306-
ifndef::restricted[]
307-
<15> Activate a predefined set of cluster capabilities.
308-
<16> Add the additional cluster capabilities you want to enable here.
309-
+
310-
[IMPORTANT]
311-
====
312-
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.
313-
====
314-
endif::restricted[]
315-
endif::ibm-z,ibm-z-kvm,ibm-power,agnostic,rhv[]
316295
ifdef::openshift-origin[]
317296
<13> The SSH public key for the `core` user in {op-system-first}.
318297
endif::openshift-origin[]

0 commit comments

Comments
 (0)