Skip to content

Commit a4f9122

Browse files
authored
Merge pull request #49742 from maxwelldb/install-config-mystery-ocpbugs163
[OCPBUGS#163] Install config initialization conditional stack mystery
2 parents ed7ff24 + 25e5127 commit a4f9122

7 files changed

+18
-12
lines changed

modules/cli-installing-cli-web-console-macos.adoc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
ifeval::["{context}" == "updating-restricted-network-cluster"]
2-
:restricted:
3-
endif::[]
4-
51
:_content-type: PROCEDURE
62
[id="cli-installing-cli-web-console-macos_{context}"]
73
= Installing the OpenShift CLI on macOS using the web console

modules/installation-aws-user-infra-installation.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
ifeval::["{context}" == "installing-restricted-networks-aws"]
77
:restricted:
88
endif::[]
9+
ifdef::openshift-origin[]
10+
:restricted:
11+
endif::[]
912

1013
:_content-type: PROCEDURE
1114
[id="installation-aws-user-infra-installation_{context}"]

modules/installation-complete-user-infra.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ endif::[]
1919
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
2020
:restricted:
2121
endif::[]
22+
ifdef::openshift-origin[]
23+
:restricted:
24+
endif::[]
2225
ifeval::["{context}" == "installing-ibm-z"]
2326
:ibm-z:
2427
endif::[]
@@ -193,7 +196,7 @@ ifeval::["{context}" == "installing-ibm-power"]
193196
endif::[]
194197
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
195198
:!ibm-power:
196-
:restricted:
199+
:!restricted:
197200
endif::[]
198201
ifeval::["{context}" == "installing-ibm-z-kvm"]
199202
:!ibm-z-kvm:

modules/installation-load-balancing-user-infra.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ endif::[]
4444
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
4545
:restricted:
4646
endif::[]
47-
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
48-
:restricted:
49-
endif::[]
5047

5148
:_content-type: CONCEPT
5249
[id="installation-load-balancing-user-infra_{context}"]
@@ -273,3 +270,6 @@ endif::[]
273270
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
274271
:!restricted:
275272
endif::[]
273+
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
274+
:!restricted:
275+
endif::[]

modules/installation-network-user-infra.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ endif::[]
5050
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
5151
:restricted:
5252
endif::[]
53-
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
54-
:restricted:
55-
endif::[]
5653
ifeval::["{context}" == "installing-azure-user-infra"]
5754
:azure:
5855
endif::[]
@@ -307,6 +304,9 @@ endif::[]
307304
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
308305
:!restricted:
309306
endif::[]
307+
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
308+
:!restricted:
309+
endif::[]
310310
ifeval::["{context}" == "installing-azure-user-infra"]
311311
:!azure:
312312
endif::[]

modules/installation-user-infra-machines-static-network.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,4 +540,5 @@ ifeval::["{context}" == "installing-ibm-power"]
540540
endif::[]
541541
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
542542
:!ibm-power:
543+
:!restricted:
543544
endif::[]

modules/installation-vsphere-config-yaml.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
1111
:restricted:
1212
endif::[]
13+
ifdef::openshift-origin[]
14+
:restricted:
15+
endif::[]
1316
ifeval::["{context}" == "installing-restricted-networks-vmc-user-infra"]
1417
:restricted:
1518
endif::[]
@@ -223,4 +226,4 @@ ifdef::openshift-origin[]
223226
endif::[]
224227
ifeval::["{context}" == "installing-restricted-networks-vmc-user-infra"]
225228
:!restricted:
226-
endif::[]
229+
endif::[]

0 commit comments

Comments
 (0)