Skip to content

Commit 18b0709

Browse files
authored
Merge pull request #65159 from dfitzmau/OCPBUGS-18561-dup-fix
[enterprise-4.14] OCPBUGS-18561-dup-fix
2 parents b6ba8ca + cbc3347 commit 18b0709

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

modules/installation-initializing-manual.adoc

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,18 @@ endif::[]
2525
ifeval::["{context}" == "installing-azure-stack-hub-user-infra"]
2626
:ash:
2727
endif::[]
28+
ifeval::["{context}" == "installing-vsphere"]
29+
:vsphere-upi-vsphere:
30+
endif::[]
2831
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
2932
:restricted-upi:
3033
endif::[]
3134
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
3235
:restricted:
3336
endif::[]
37+
ifeval::["{context}" == "installing-vsphere-network-customizations"]
38+
:vsphere-upi:
39+
endif::[]
3440
ifeval::["{context}" == "installing-aws-china-region"]
3541
:aws-china:
3642
endif::[]
@@ -64,20 +70,14 @@ endif::[]
6470
ifeval::["{context}" == "installing-ibm-power-vs-private-cluster"]
6571
:ibm-power-vs-private:
6672
endif::[]
67-
ifeval::["{context}" == "installing-vsphere"]
68-
:vsphere-upi-vsphere:
69-
endif::[]
70-
ifeval::["{context}" == "installing-vsphere-network-customizations"]
71-
:vsphere-upi:
72-
endif::[]
7373

7474
:_content-type: PROCEDURE
7575
[id="installation-initializing-manual_{context}"]
7676
= Manually creating the installation configuration file
7777

78-
ifndef::aws-china,aws-gov,aws-secret,azure-gov,ash,aws-private,azure-private,gcp-private,gcp-shared,ash-default,ash-network,ibm-cloud-private,ibm-power-vs-private[]
78+
ifdef::restricted,vsphere-upi-vsphere[]
7979
For user-provisioned installations of {product-title}, you manually generate your installation configuration file.
80-
endif::aws-china,aws-gov,aws-secret,azure-gov,ash,aws-private,azure-private,gcp-private,gcp-shared,ash-default,ash-network,ibm-cloud-private,ibm-power-vs-private[]
80+
endif::restricted,vsphere-upi-vsphere[]
8181
ifdef::vsphere-upi,restricted-upi[]
8282
For user-provisioned installations of {product-title}, you manually generate your installation configuration file.
8383

@@ -227,12 +227,18 @@ endif::[]
227227
ifeval::["{context}" == "installing-azure-stack-hub-user-infra"]
228228
:!ash:
229229
endif::[]
230+
ifeval::["{context}" == "installing-vsphere"]
231+
:!vsphere-upi-vsphere:
232+
endif::[]
230233
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
231-
:!restricted:
234+
:!restricted-upi:
232235
endif::[]
233236
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
234237
:!restricted:
235238
endif::[]
239+
ifeval::["{context}" == "installing-vsphere-network-customizations"]
240+
:!vsphere-upi:
241+
endif::[]
236242
ifeval::["{context}" == "installing-aws-china-region"]
237243
:!aws-china:
238244
endif::[]
@@ -266,10 +272,4 @@ endif::[]
266272
ifeval::["{context}" == "installing-ibm-power-vs-private-cluster"]
267273
:!ibm-power-vs-private:
268274
endif::[]
269-
ifeval::["{context}" == "installing-vsphere"]
270-
:vsphere-upi-vsphere:
271-
endif::[]
272-
ifeval::["{context}" == "installing-vsphere-network-customizations"]
273-
:vsphere-upi:
274-
endif::[]
275275
:!platform:

modules/installation-launching-installer.adoc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
3131
// * installing/installing_openstack/installing-openstack-installer-restricted.adoc
3232
// * installing/installing_openstack/installing-openstack-installer.adoc
33-
// * installing/installing_vmc/installing-vmc.adoc
34-
// * installing/installing_vmc/installing-vmc-network-customizations.adoc
35-
// * installing/installing_vmc/installing-vmc-customizations.adoc
36-
// * installing/installing_vmc/installing-restricted-networks-vmc.adoc
3733
// * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc
3834
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
3935
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc

0 commit comments

Comments
 (0)