Skip to content

Commit 30cc8a2

Browse files
authored
Merge pull request #105887 from bscott-rh/ibm-power-vc-cleanup
Vale fixes for IBM PowerVC
2 parents 33ace5c + c3c2e2f commit 30cc8a2

6 files changed

Lines changed: 28 additions & 31 deletions

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,8 @@ Topics:
538538
Dir: installing_ibm_powervc
539539
Distros: openshift-enterprise
540540
Topics:
541-
- Name: Preparing to install on IBM PowerVC
542-
File: preparing-to-install-on-ibm-powervc
541+
- Name: Installation methods
542+
File: installation-methods-ibm-powervc
543543
- Name: Installing a cluster on IBM PowerVC with customizations
544544
File: installing-ibm-powervc-installer-custom
545545
- Name: Installation configuration parameters for IBM PowerVC

installing/installing_ibm_powervc/installation-config-parameters-ibm-powervc.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ include::_attributes/common-attributes.adoc[]
77

88
toc::[]
99

10+
[role="_abstract"]
1011
Before you deploy an {product-title} cluster on {ibm-power-vc-title} ({ibm-power-vc}), you provide parameters to customize your cluster and the platform that hosts it. When you create the `install-config.yaml` file, you provide values for the required parameters through the command line. You can then modify the `install-config.yaml` file to customize your cluster further.
1112

1213
include::modules/installation-configuration-parameters.adoc[leveloffset=+1]

installing/installing_ibm_powervc/preparing-to-install-on-ibm-powervc.adoc renamed to installing/installing_ibm_powervc/installation-methods-ibm-powervc.adoc

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
[id="preparing-to-install-on-powervc"]
3-
= Preparing to install on IBM PowerVC
2+
[id="installation-methods-ibm-powervc"]
3+
= Installation methods
44
include::_attributes/common-attributes.adoc[]
5-
:context: preparing-to-install-on-powervc
5+
:context: installation-methods-ibm-powervc
66

77
toc::[]
88

9-
You can install {product-title} on {ibm-power-vc-title} ({ibm-power-vc-name}) using installer-provisioned infrastructure.
10-
11-
[id="preparing-to-install-on-powervc-prerequisites"]
12-
== Prerequisites
13-
14-
* You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes.
15-
* You read the documentation on xref:../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users].
9+
[role="_abstract"]
10+
You can install {product-title} on {ibm-power-vc-name} using installer-provisioned infrastructure. This process involves using the installation program to provision the underlying infrastructure for your cluster.
1611

1712
[id="choosing-an-method-to-install-ocp-on-powervc-installer-provisioned"]
18-
=== Installing a cluster on installer-provisioned infrastructure
13+
== Installing a cluster on installer-provisioned infrastructure
1914

2015
You can install a cluster on {ibm-power-vc-name} infrastructure that is provisioned by the {product-title} installation program, by using one of the following methods:
2116

installing/installing_ibm_powervc/installing-ibm-powervc-installer-custom.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
In {product-title} version {product-version}, you can install a customized cluster on
10-
{ibm-power-vc-name}. To customize the installation, modify parameters in the `install-config.yaml` before you install the cluster.
9+
[role="_abstract"]
10+
In {product-title} version {product-version}, you can install a customized cluster on {ibm-power-vc-name}. To customize the installation, modify parameters in the `install-config.yaml` before you install the cluster.
1111

1212
== Prerequisites
1313

installing/installing_ibm_powervc/uninstalling-cluster-powervc.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ include::_attributes/common-attributes.adoc[]
77

88
toc::[]
99

10-
You can remove a cluster that you deployed to {ibm-power-vc-name}.
10+
[role="_abstract"]
11+
You can remove a cluster that you deployed to {ibm-power-vc-name} using the installation program.
1112

1213
// Removing a cluster that uses installer-provisioned infrastructure
1314
include::modules/installation-uninstall-clouds.adoc[leveloffset=+1]

modules/installation-initializing.adoc

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -165,21 +165,6 @@ You can customize the {product-title} cluster you install on
165165
ifdef::aws[]
166166
Amazon Web Services (AWS).
167167
endif::aws[]
168-
ifdef::azure[]
169-
Microsoft Azure.
170-
171-
[IMPORTANT]
172-
====
173-
Do not specify `windows`, `microsoft`, or other variants of these words in the `metadata.name` parameter of the `install-config.yaml` file. Specifying one of these words for the cluster name causes the installation program to generate an error message like the following example message:
174-
175-
[source,terminal]
176-
----
177-
The resource name 'windows-xxxx-identity' or a part of the name is a trademarked or reserved word.
178-
----
179-
180-
Additionally, specifying `login` at the beginning of the name in the `metadata.name` parameter of the `install-config.yaml` file results in the generation of an error message. You can specify `login` in the middle or end of the name.
181-
====
182-
endif::azure[]
183168
ifdef::gcp[]
184169
{gcp-first}.
185170
endif::gcp[]
@@ -198,6 +183,21 @@ endif::nutanix[]
198183
ifdef::ibm-power-vc-platform[]
199184
{ibm-power-vc-name}.
200185
endif::ibm-power-vc-platform[]
186+
ifdef::azure[]
187+
Microsoft Azure.
188+
189+
[IMPORTANT]
190+
====
191+
Do not specify `windows`, `microsoft`, or other variants of these words in the `metadata.name` parameter of the `install-config.yaml` file. Specifying one of these words for the cluster name causes the installation program to generate an error message like the following example message:
192+
193+
[source,terminal]
194+
----
195+
The resource name 'windows-xxxx-identity' or a part of the name is a trademarked or reserved word.
196+
----
197+
198+
Additionally, specifying `login` at the beginning of the name in the `metadata.name` parameter of the `install-config.yaml` file results in the generation of an error message. You can specify `login` in the middle or end of the name.
199+
====
200+
endif::azure[]
201201

202202
.Prerequisites
203203

0 commit comments

Comments
 (0)