Skip to content

Commit 07c5031

Browse files
authored
Merge pull request #64683 from mjpytlak/osdocs-6506
OSDOCS#6506: Nutanix - move install config parameters out of assemblies
2 parents cc7ec93 + 2f24619 commit 07c5031

5 files changed

+41
-27
lines changed

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,8 @@ Topics:
309309
File: installing-nutanix-three-node
310310
- Name: Uninstalling a cluster on Nutanix
311311
File: uninstalling-cluster-nutanix
312+
- Name: Installation configuration parameters for Nutanix
313+
File: installation-config-parameters-nutanix
312314
- Name: Installing on bare metal
313315
Dir: installing_bare_metal
314316
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-nutanix"]
3+
= Installation configuration parameters for Nutanix
4+
include::_attributes/common-attributes.adoc[]
5+
:context: installation-config-parameters-nutanix
6+
:platform: Nutanix
7+
8+
toc::[]
9+
10+
Before you deploy an {product-title} cluster on Nutanix, 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_nutanix/installing-nutanix-installer-provisioned.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
3737
include::modules/installation-adding-nutanix-root-certificates.adoc[leveloffset=+1]
3838

3939
include::modules/installation-initializing.adoc[leveloffset=+1]
40-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
40+
41+
[role="_additional-resources"]
42+
.Additional resources
43+
* xref:../../installing/installing_nutanix/installation-config-parameters-nutanix.adoc#installation-config-parameters-nutanix[Installation configuration parameters for Nutanix]
44+
4145
include::modules/installation-nutanix-config-yaml.adoc[leveloffset=+2]
4246
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
4347

installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ include::modules/installation-adding-nutanix-root-certificates.adoc[leveloffset=
3838
include::modules/installation-nutanix-download-rhcos.adoc[leveloffset=+1]
3939

4040
include::modules/installation-initializing.adoc[leveloffset=+1]
41-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
41+
42+
[role="_additional-resources"]
43+
.Additional resources
44+
* xref:../../installing/installing_nutanix/installation-config-parameters-nutanix.adoc#installation-config-parameters-nutanix[Installation configuration parameters for Nutanix]
45+
4246
include::modules/installation-nutanix-config-yaml.adoc[leveloffset=+2]
4347
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
4448

modules/installation-configuration-parameters.adoc

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
// * installing/installing_openstack/installing-openstack-user-sr-iov-kuryr.adoc
2323
// * installing/installing_openstack/installing-openstack-user-sr-iov.adoc
2424
// * installing/installing_openstack/installing-openstack-user.adoc
25-
// * installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc
26-
// * installing/installing-restricted-networks-nutanix-installer-provisioned.adoc
2725
// * installing/installing_vsphere/installation-config-parameters-vsphere.adoc
2826
// * installing/installing_gcp/installation-config-parameters-gcp.adoc
2927
// * installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc
@@ -34,6 +32,7 @@
3432
// * installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vps.adoc
3533
// * installing/installing_alibaba/installation-config-parameters-alibaba.adoc
3634
// * installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs.adoc
35+
// * installing/installing_nutanix/installation-config-parameters-nutanix.adoc
3736

3837
ifeval::["{context}" == "installing-aws-customizations"]
3938
:aws:
@@ -107,12 +106,6 @@ ifeval::["{context}" == "installing-openstack-installer-restricted"]
107106
:osp:
108107
:osp-custom:
109108
endif::[]
110-
ifeval::["{context}" == "installing-nutanix-installer-provisioned"]
111-
:nutanix:
112-
endif::[]
113-
ifeval::["{context}" == "installing-restricted-networks-nutanix-installer-provisioned"]
114-
:nutanix:
115-
endif::[]
116109
ifeval::["{context}" == "installation-config-parameters-vsphere"]
117110
:vsphere:
118111
endif::[]
@@ -143,50 +136,52 @@ endif::[]
143136
ifeval::["{context}" == "installation-config-parameters-ibm-power-vs"]
144137
:ibm-power-vs:
145138
endif::[]
146-
139+
ifeval::["{context}" == "installation-config-parameters-nutanix"]
140+
:nutanix:
141+
endif::[]
147142

148143
:_content-type: CONCEPT
149144
[id="installation-configuration-parameters_{context}"]
150-
ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
145+
ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix[]
151146
= Installation configuration parameters
152-
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
147+
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix[]
153148

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

161156
// If install-config.yaml is generated by openshift-install
162157
// 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
163158
// This accommodates the existing IA of the installation assemblies, while the improvement is implemented.
164159
// As part of the updates for the last provider, content between lines 277-292 can be completely removed.
165-
ifndef::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud,ibm-power-vs[]
160+
ifndef::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix[]
166161
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.
167-
endif::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud,ibm-power-vs[]
162+
endif::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix[]
168163

169164
// A condition for this note is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
170165
// This accommodates the existing content for installation assemblies, while the improvement is implemented.
171166
// As part of the updates for the last provider, this note can be removed from the module.
172-
ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
167+
ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix[]
173168
[NOTE]
174169
====
175170
After installation, you cannot modify these parameters in the `install-config.yaml` file.
176171
====
177-
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
172+
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix[]
178173

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

185180
[NOTE]
186181
====
187182
After installation, you cannot modify these parameters in the `install-config.yaml` file.
188183
====
189-
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs[]
184+
endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix[]
190185

191186
[id="installation-configuration-parameters-required_{context}"]
192187
== Required configuration parameters
@@ -2132,12 +2127,6 @@ ifeval::["{context}" == "installing-openstack-installer-restricted"]
21322127
:!osp:
21332128
:!osp-custom:
21342129
endif::[]
2135-
ifeval::["{context}" == "installing-nutanix-installer-provisioned"]
2136-
:!nutanix:
2137-
endif::[]
2138-
ifeval::["{context}" == "installing-restricted-networks-nutanix-installer-provisioned"]
2139-
:!nutanix:
2140-
endif::[]
21412130
ifeval::["{context}" == "installation-config-parameters-vsphere"]
21422131
:!vsphere:
21432132
endif::[]
@@ -2168,4 +2157,7 @@ endif::[]
21682157
ifeval::["{context}" == "installation-config-parameters-ibm-power-vs"]
21692158
:!ibm-power-vs:
21702159
endif::[]
2160+
ifeval::["{context}" == "installation-config-parameters-nutanix"]
2161+
:!nutanix:
2162+
endif::[]
21712163
:!platform:

0 commit comments

Comments
 (0)