Skip to content

Commit 71ac958

Browse files
committed
OSDOCS#6504: IBM Power VS - move install config parameters out of assemblies
1 parent 49e6435 commit 71ac958

7 files changed

+44
-96
lines changed

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,8 @@ Topics:
432432
File: installing-restricted-networks-ibm-power-vs
433433
- Name: Uninstalling a cluster on IBM Power Virtual Server
434434
File: uninstalling-cluster-ibm-power-vs
435+
- Name: Installation configuration parameters for IBM Power Virtual Server
436+
File: installation-config-parameters-ibm-power-vs
435437
- Name: Installing on OpenStack
436438
Dir: installing_openstack
437439
Distros: openshift-origin,openshift-enterprise
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
:_content-type: ASSEMBLY
2+
[id="installation-config-parameters-ibm-power-vs"]
3+
= Installation configuration parameters for {ibmpowerProductName} Virtual Server
4+
include::_attributes/common-attributes.adoc[]
5+
:context: installation-config-parameters-ibm-power-vs
6+
:platform: {ibmpowerProductName} Virtual Server
7+
8+
toc::[]
9+
10+
Before you deploy an {product-title} on {ibmpowerProductName} Virtual Server, 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.
11+
12+
include::modules/installation-configuration-parameters.adoc[leveloffset=+1]

installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ include::modules/installation-ibm-cloud-export-variables.adoc[leveloffset=+1]
3030

3131
include::modules/installation-initializing.adoc[leveloffset=+1]
3232

33-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
33+
[role="_additional-resources"]
34+
.Additional resources
35+
* xref:../../installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs#installation-config-parameters-ibm-power-vs[Installation configuration parameters for {ibmpowerProductName} Virtual Server]
3436

3537
include::modules/installation-ibm-power-vs-config-yaml.adoc[leveloffset=+2]
3638

installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ include::modules/installation-ibm-cloud-export-variables.adoc[leveloffset=+1]
3636

3737
include::modules/installation-initializing-manual.adoc[leveloffset=+1]
3838

39-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
39+
[role="_additional-resources"]
40+
.Additional resources
41+
* xref:../../installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs#installation-config-parameters-ibm-power-vs[Installation configuration parameters for {ibmpowerProductName} Virtual Server]
4042

4143
include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
4244

installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ include::modules/installation-ibm-cloud-export-variables.adoc[leveloffset=+1]
3232

3333
include::modules/installation-initializing.adoc[leveloffset=+1]
3434

35-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
35+
[role="_additional-resources"]
36+
.Additional resources
37+
* xref:../../installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs#installation-config-parameters-ibm-power-vs[Installation configuration parameters for {ibmpowerProductName} Virtual Server]
3638

3739
include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
3840

installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ include::modules/installation-ibm-cloud-export-variables.adoc[leveloffset=+1]
4141

4242
include::modules/installation-initializing.adoc[leveloffset=+1]
4343

44-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
44+
[role="_additional-resources"]
45+
.Additional resources
46+
* xref:../../installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs#installation-config-parameters-ibm-power-vs[Installation configuration parameters for {ibmpowerProductName} Virtual Server]
4547

4648
include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
4749

@@ -74,4 +76,4 @@ include::modules/cluster-telemetry.adoc[leveloffset=+1]
7476
[id="next-steps_installing-ibm-power-vs-restricted"]
7577
== Next steps
7678
* xref:../../post_installation_configuration/cluster-tasks.adoc#available_cluster_customizations[Customize your cluster]
77-
* Optional: xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[Opt out of remote health reporting]
79+
* Optional: xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[Opt out of remote health reporting]

modules/installation-configuration-parameters.adoc

Lines changed: 17 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
// * installing/installing_azure/installing-azure-network-customizations.adoc
1515
// * installing/installing_azure/installing-azure-private.adoc
1616
// * installing/installing_azure/installing-azure-vnet.adoc
17-
// * installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc
18-
// * installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc
19-
// * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
20-
// * installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc
2117
// * installing/installing_openstack/installing-openstack-installer-custom.adoc
2218
// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
2319
// * installing/installing_openstack/installing-openstack-installer-restricted.adoc
@@ -26,15 +22,6 @@
2622
// * installing/installing_openstack/installing-openstack-user-sr-iov-kuryr.adoc
2723
// * installing/installing_openstack/installing-openstack-user-sr-iov.adoc
2824
// * installing/installing_openstack/installing-openstack-user.adoc
29-
// * installing/installing_vmc/installing-restricted-networks-vmc.adoc
30-
// * installing/installing_vmc/installing-vmc-customizations.adoc
31-
// * installing/installing_vmc/installing-vmc-network-customizations.adoc
32-
// * installing/installing_vmc/installing-vmc-user-infra.adoc
33-
// * installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc
34-
// * installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc
35-
// * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
36-
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
37-
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
3825
// * installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc
3926
// * installing/installing-restricted-networks-nutanix-installer-provisioned.adoc
4027
// * installing/installing_vsphere/installation-config-parameters-vsphere.adoc
@@ -46,6 +33,7 @@
4633
// * installing/installing_bare_metal/installation-config-parameters-bare-metal.adoc
4734
// * installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vps.adoc
4835
// * installing/installing_alibaba/installation-config-parameters-alibaba.adoc
36+
// * installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs.adoc
4937

5038
ifeval::["{context}" == "installing-aws-customizations"]
5139
:aws:
@@ -115,46 +103,10 @@ ifeval::["{context}" == "installing-openstack-user-sr-iov-kuryr"]
115103
:osp:
116104
:osp-kuryr:
117105
endif::[]
118-
ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"]
119-
:vsphere:
120-
endif::[]
121-
ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"]
122-
:vsphere:
123-
endif::[]
124-
ifeval::["{context}" == "installing-vmc-customizations"]
125-
:vmc:
126-
endif::[]
127-
ifeval::["{context}" == "installing-vmc-network-customizations"]
128-
:vmc:
129-
endif::[]
130-
ifeval::["{context}" == "installing-restricted-networks-vmc"]
131-
:vmc:
132-
endif::[]
133-
ifeval::["{context}" == "installing-vmc-user-infra"]
134-
:vmc:
135-
endif::[]
136-
ifeval::["{context}" == "installing-vmc-network-customizations-user-infra"]
137-
:vmc:
138-
endif::[]
139-
ifeval::["{context}" == "installing-restricted-networks-vmc-user-infra"]
140-
:vmc:
141-
endif::[]
142106
ifeval::["{context}" == "installing-openstack-installer-restricted"]
143107
:osp:
144108
:osp-custom:
145109
endif::[]
146-
ifeval::["{context}" == "installing-ibm-power-vs-customizations"]
147-
:ibm-power-vs:
148-
endif::[]
149-
ifeval::["{context}" == "installing-ibm-power-vs-private-cluster"]
150-
:ibm-power-vs:
151-
endif::[]
152-
ifeval::["{context}" == "installing-restricted-networks-ibm-power-vs"]
153-
:ibm-power-vs:
154-
endif::[]
155-
ifeval::["{context}" == "installing-ibm-powervs-vpc"]
156-
:ibm-power-vs:
157-
endif::[]
158110
ifeval::["{context}" == "installing-nutanix-installer-provisioned"]
159111
:nutanix:
160112
endif::[]
@@ -188,55 +140,53 @@ endif::[]
188140
ifeval::["{context}" == "installation-config-parameters-alibaba"]
189141
:alibaba-cloud:
190142
endif::[]
143+
ifeval::["{context}" == "installation-config-parameters-ibm-power-vs"]
144+
:ibm-power-vs:
145+
endif::[]
191146

192147

193148
:_content-type: CONCEPT
194149
[id="installation-configuration-parameters_{context}"]
195-
ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
150+
ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
196151
= Installation configuration parameters
197-
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
152+
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
198153

199154
// Managing headings is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
200155
// This accommodates the existing IA of the installation assemblies, while the improvement is implemented.
201156
// As part of the updates for the last provider, the conditions can be removed and the following heading can be used.
202-
ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
157+
ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
203158
= Available installation configuration parameters for {platform}
204-
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
159+
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
205160

206161
// If install-config.yaml is generated by openshift-install
207162
// The addition of providers beyond bare,ibm-power,ibm-z,ash is necessary as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493
208163
// This accommodates the existing IA of the installation assemblies, while the improvement is implemented.
209164
// As part of the updates for the last provider, content between lines 277-292 can be completely removed.
210-
ifndef::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud[]
165+
ifndef::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud,ibm-power-vs[]
211166
Before you deploy an {product-title} cluster, you provide parameter values to describe your account on the cloud platform that hosts your cluster and optionally customize your cluster's platform. When you create the `install-config.yaml` installation configuration file, you provide values for the required parameters through the command line. If you customize your cluster, you can modify the `install-config.yaml` file to provide more details about the platform.
212-
endif::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud[]
213-
214-
// If the user manually creates install-config.yaml
215-
ifdef::ibm-power-vs[]
216-
Before you deploy an {product-title} cluster, you provide a customized `install-config.yaml` installation configuration file that describes the details for your environment.
217-
endif::ibm-power-vs[]
167+
endif::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud,ibm-power-vs[]
218168

219169
// A condition for this note is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
220170
// This accommodates the existing content for installation assemblies, while the improvement is implemented.
221171
// As part of the updates for the last provider, this note can be removed from the module.
222-
ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
172+
ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
223173
[NOTE]
224174
====
225175
After installation, you cannot modify these parameters in the `install-config.yaml` file.
226176
====
227-
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
177+
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
228178

229179
// This condition is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
230180
// As part of the update for each provider, this content applies to the net new provider-specific installation configuration parameter assembly.
231181
// As part of the updates for the last provider, the conditions can be completely removed.
232-
ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
182+
ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
233183
The following tables specify the required, optional, and {platform}-specific installation configuration parameters that you can set as part of the installation process.
234184

235185
[NOTE]
236186
====
237187
After installation, you cannot modify these parameters in the `install-config.yaml` file.
238188
====
239-
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
189+
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
240190

241191
[id="installation-configuration-parameters-required_{context}"]
242192
== Required configuration parameters
@@ -2165,37 +2115,10 @@ ifeval::["{context}" == "installing-openstack-user-sr-iov-kuryr"]
21652115
:!osp:
21662116
:!osp-kuryr:
21672117
endif::[]
2168-
ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"]
2169-
:!vsphere:
2170-
endif::[]
2171-
ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"]
2172-
:!vsphere:
2173-
endif::[]
2174-
ifeval::["{context}" == "installing-vmc-customizations"]
2175-
:!vmc:
2176-
endif::[]
2177-
ifeval::["{context}" == "installing-vmc-network-customizations"]
2178-
:!vmc:
2179-
endif::[]
2180-
ifeval::["{context}" == "installing-restricted-networks-vmc"]
2181-
:!vmc:
2182-
endif::[]
21832118
ifeval::["{context}" == "installing-openstack-installer-restricted"]
21842119
:!osp:
21852120
:!osp-custom:
21862121
endif::[]
2187-
ifeval::["{context}" == "installing-ibm-power-vs-customizations"]
2188-
:!ibm-power-vs:
2189-
endif::[]
2190-
ifeval::["{context}" == "installing-ibm-power-vs-private-cluster"]
2191-
:!ibm-power-vs:
2192-
endif::[]
2193-
ifeval::["{context}" == "installing-restricted-networks-ibm-power-vs"]
2194-
:!ibm-power-vs:
2195-
endif::[]
2196-
ifeval::["{context}" == "installing-ibm-powervs-vpc"]
2197-
:!ibm-power-vs:
2198-
endif::[]
21992122
ifeval::["{context}" == "installing-nutanix-installer-provisioned"]
22002123
:!nutanix:
22012124
endif::[]
@@ -2229,4 +2152,7 @@ endif::[]
22292152
ifeval::["{context}" == "installation-config-parameters-alibaba"]
22302153
:!alibaba-cloud:
22312154
endif::[]
2155+
ifeval::["{context}" == "installation-config-parameters-ibm-power-vs"]
2156+
:!ibm-power-vs:
2157+
endif::[]
22322158
:!platform:

0 commit comments

Comments
 (0)