Skip to content

Commit f1dda5d

Browse files
authored
Merge pull request #63603 from mjpytlak/osdocs-6502
OSDOCS#6502: ASH - move install config parameters out of assemblies
2 parents 99dcbe0 + e492707 commit f1dda5d

File tree

5 files changed

+41
-26
lines changed

5 files changed

+41
-26
lines changed

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ Topics:
232232
File: installing-azure-stack-hub-network-customizations
233233
- Name: Installing a cluster on Azure Stack Hub using ARM templates
234234
File: installing-azure-stack-hub-user-infra
235+
- Name: Installation configuration parameters for Azure Stack Hub
236+
File: installation-config-parameters-ash
235237
- Name: Uninstalling a cluster on Azure Stack Hub
236238
File: uninstalling-cluster-azure-stack-hub
237239
- Name: Installing on GCP
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-ash"]
3+
= Installation configuration parameters for Azure Stack Hub
4+
include::_attributes/common-attributes.adoc[]
5+
:context: installation-config-parameters-ash
6+
:platform: Azure Stack Hub
7+
8+
toc::[]
9+
10+
Before you deploy an {product-title} cluster on Azure Stack Hub, you provide a customized `install-config.yaml` installation configuration file that describes the details for your environment.
11+
12+
include::modules/installation-configuration-parameters.adoc[leveloffset=+1]

installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ include::modules/installation-azure-user-infra-uploading-rhcos.adoc[leveloffset=
3131
include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
3232

3333
include::modules/installation-initializing-manual.adoc[leveloffset=+1]
34-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
34+
35+
[role="_additional-resources"]
36+
.Additional resources
37+
* xref:../../installing/installing_azure_stack_hub/installation-config-parameters-ash.adoc#installation-config-parameters-ash[Installation configuration parameters for Azure Stack Hub]
38+
3539
include::modules/installation-azure-stack-hub-config-yaml.adoc[leveloffset=+2]
3640

3741
include::modules/manually-create-identity-access-management.adoc[leveloffset=+1]

installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ include::modules/installation-azure-user-infra-uploading-rhcos.adoc[leveloffset=
3030
include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
3131

3232
include::modules/installation-initializing-manual.adoc[leveloffset=+1]
33-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
33+
34+
[role="_additional-resources"]
35+
.Additional resources
36+
* xref:../../installing/installing_azure_stack_hub/installation-config-parameters-ash.adoc#installation-config-parameters-ash[Installation configuration parameters for Azure Stack Hub]
37+
3438
include::modules/installation-azure-stack-hub-config-yaml.adoc[leveloffset=+2]
3539

3640
include::modules/manually-create-identity-access-management.adoc[leveloffset=+1]

modules/installation-configuration-parameters.adoc

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,14 @@
4646
// * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
4747
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
4848
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
49-
// * installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc
50-
// * installing/installing_azure_stack_hub/installing-azure-stack-hub-customizations.adoc
5149
// * installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc
5250
// * installing/installing-restricted-networks-nutanix-installer-provisioned.adoc
5351
// * installing/installing_vsphere/installation-config-parameters-vsphere.adoc
5452
// * installing/installing_gcp/installation-config-parameters-gcp.adoc
5553
// * installing/installing_gcp/installation-config-parameters-ibm-z.adoc
5654
// * installing/installing_gcp/installation-config-parameters-ibm-z-kvm.adoc
5755
// * installing/installing_gcp/installation-config-parameters-ibm-power.adoc
56+
// * installing/installing_azure_stack_hub/installation-config-parameters-ash.adoc
5857

5958
ifeval::["{context}" == "installing-alibaba-customizations"]
6059
:alibabacloud:
@@ -193,12 +192,6 @@ endif::[]
193192
ifeval::["{context}" == "installing-ibm-powervs-vpc"]
194193
:ibm-power-vs:
195194
endif::[]
196-
ifeval::["{context}" == "installing-azure-stack-hub-default"]
197-
:ash:
198-
endif::[]
199-
ifeval::["{context}" == "installing-azure-stack-hub-network-customizations"]
200-
:ash:
201-
endif::[]
202195
ifeval::["{context}" == "installing-nutanix-installer-provisioned"]
203196
:nutanix:
204197
endif::[]
@@ -220,20 +213,23 @@ endif::[]
220213
ifeval::["{context}" == "installation-config-parameters-ibm-power"]
221214
:ibm-power:
222215
endif::[]
216+
ifeval::["{context}" == "installation-config-parameters-ash"]
217+
:ash:
218+
endif::[]
223219

224220

225221
:_content-type: CONCEPT
226222
[id="installation-configuration-parameters_{context}"]
227-
ifndef::vsphere,gcp,ibm-z,ibm-power[]
223+
ifndef::vsphere,gcp,ibm-z,ibm-power,ash[]
228224
= Installation configuration parameters
229-
endif::vsphere,gcp,ibm-z,ibm-power[]
225+
endif::vsphere,gcp,ibm-z,ibm-power,ash[]
230226

231227
// Managing headings is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
232228
// This accommodates the existing IA of the installation assemblies, while the improvement is implemented.
233229
// As part of the updates for the last provider, the conditions can be removed and the following heading can be used.
234-
ifdef::vsphere,gcp,ibm-z,ibm-power[]
230+
ifdef::vsphere,gcp,ibm-z,ibm-power,ash[]
235231
= Available installation configuration parameters for {platform}
236-
endif::vsphere,gcp,ibm-z,ibm-power[]
232+
endif::vsphere,gcp,ibm-z,ibm-power,ash[]
237233

238234
// If install-config.yaml is generated by openshift-install
239235
// 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
@@ -244,31 +240,31 @@ Before you deploy an {product-title} cluster, you provide parameter values to de
244240
endif::bare,ibm-power,ibm-z,ash,vsphere,gcp[]
245241

246242
// If the user manually creates install-config.yaml
247-
ifdef::bare,ibm-power-vs,ash[]
243+
ifdef::bare,ibm-power-vs[]
248244
Before you deploy an {product-title} cluster, you provide a customized `install-config.yaml` installation configuration file that describes the details for your environment.
249-
endif::bare,ibm-power-vs,ash[]
245+
endif::bare,ibm-power-vs[]
250246

251247
// A condition for this note is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
252248
// This accommodates the existing content for installation assemblies, while the improvement is implemented.
253249
// As part of the updates for the last provider, this note can be removed from the module
254-
ifndef::vsphere,gcp,ibm-z,ibm-power[]
250+
ifndef::vsphere,gcp,ibm-z,ibm-power,ash[]
255251
[NOTE]
256252
====
257253
After installation, you cannot modify these parameters in the `install-config.yaml` file.
258254
====
259-
endif::vsphere,gcp,ibm-z,ibm-power[]
255+
endif::vsphere,gcp,ibm-z,ibm-power,ash[]
260256

261257
// This condition is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
262258
// As part of the update for each provider, this content applies to the net new provider-specific installation configuration parameter assembly.
263259
// As part of the updates for the last provider, the conditions can be completely removed.
264-
ifdef::vsphere,gcp,ibm-z,ibm-power[]
260+
ifdef::vsphere,gcp,ibm-z,ibm-power,ash[]
265261
The following tables specify the required, optional, and {platform}-specific installation configuration parameters that you can set as part of the installation process.
266262

267263
[NOTE]
268264
====
269265
After installation, you cannot modify these parameters in the `install-config.yaml` file.
270266
====
271-
endif::vsphere,gcp,ibm-z,ibm-power[]
267+
endif::vsphere,gcp,ibm-z,ibm-power,ash[]
272268

273269
[id="installation-configuration-parameters-required_{context}"]
274270
== Required configuration parameters
@@ -2241,12 +2237,6 @@ endif::[]
22412237
ifeval::["{context}" == "installing-ibm-powervs-vpc"]
22422238
:!ibm-power-vs:
22432239
endif::[]
2244-
ifeval::["{context}" == "installing-azure-stack-hub-default"]
2245-
:!ash:
2246-
endif::[]
2247-
ifeval::["{context}" == "installing-azure-stack-hub-network-customizations"]
2248-
:!ash:
2249-
endif::[]
22502240
ifeval::["{context}" == "installing-nutanix-installer-provisioned"]
22512241
:!nutanix:
22522242
endif::[]
@@ -2268,4 +2258,7 @@ endif::[]
22682258
ifeval::["{context}" == "installation-config-parameters-ibm-z-kvm"]
22692259
:!ibm-power:
22702260
endif::[]
2261+
ifeval::["{context}" == "installation-config-parameters-ash"]
2262+
:!ash:
2263+
endif::[]
22712264
:!platform:

0 commit comments

Comments
 (0)