Skip to content

Commit 80dc8ed

Browse files
authored
Merge pull request #72935 from SNiemann15/config_yaml_conditionals
[OCPBUGS-30752] Change conditionals to ifdef
2 parents 8c44724 + 39f3393 commit 80dc8ed

File tree

1 file changed

+9
-45
lines changed

1 file changed

+9
-45
lines changed

modules/installation-bare-metal-config-yaml.adoc

Lines changed: 9 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -75,58 +75,22 @@ compute: <2>
7575
- hyperthreading: Enabled <3>
7676
name: worker
7777
replicas: 0 <4>
78-
ifeval::["{context}" == "installing-ibm-z"]
79-
architecture: s390x
80-
endif::[]
81-
ifeval::["{context}" == "installing-ibm-z-kvm"]
82-
architecture: s390x
83-
endif::[]
84-
ifeval::["{context}" == "installing-ibm-z-lpar"]
85-
architecture: s390x
86-
endif::[]
87-
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
88-
architecture: s390x
89-
endif::[]
90-
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
91-
architecture: s390x
92-
endif::[]
93-
ifeval::["{context}" == "installing-restricted-networks-ibm-z-lpar"]
78+
ifdef::ibm-z,ibm-z-kvm[]
9479
architecture: s390x
95-
endif::[]
96-
ifeval::["{context}" == "installing-ibm-power"]
80+
endif::ibm-z,ibm-z-kvm[]
81+
ifdef::ibm-power[]
9782
architecture: ppc64le
98-
endif::[]
99-
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
100-
architecture : ppc64le
101-
endif::[]
83+
endif::ibm-power[]
10284
controlPlane: <2>
10385
hyperthreading: Enabled <3>
10486
name: master
10587
replicas: 3 <5>
106-
ifeval::["{context}" == "installing-ibm-z"]
107-
architecture: s390x
108-
endif::[]
109-
ifeval::["{context}" == "installing-ibm-z-kvm"]
110-
architecture: s390x
111-
endif::[]
112-
ifeval::["{context}" == "installing-ibm-z-lpar"]
113-
architecture: s390x
114-
endif::[]
115-
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
116-
architecture: s390x
117-
endif::[]
118-
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
119-
architecture: s390x
120-
endif::[]
121-
ifeval::["{context}" == "installing-restricted-networks-ibm-z-lpar"]
88+
ifdef::ibm-z,ibm-z-kvm[]
12289
architecture: s390x
123-
endif::[]
124-
ifeval::["{context}" == "installing-ibm-power"]
125-
architecture: ppc64le
126-
endif::[]
127-
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
90+
endif::ibm-z,ibm-z-kvm[]
91+
ifdef::ibm-power[]
12892
architecture: ppc64le
129-
endif::[]
93+
endif::ibm-power[]
13094
metadata:
13195
name: test <6>
13296
networking:
@@ -362,7 +326,7 @@ ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
362326
:!ibm-z-kvm:
363327
:!restricted:
364328
endif::[]
365-
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
329+
ifeval::["{context}" == "installing-restricted-networks-ibm-z-lpar"]
366330
:!ibm-z:
367331
:!restricted:
368332
endif::[]

0 commit comments

Comments
 (0)