Skip to content

Commit a9f4840

Browse files
authored
Merge pull request #40584 from SNiemann15/ipconfig_410
[MULTIARCH-1494] Ipsec support on IBM Z for 4.10
2 parents 1676498 + f602795 commit a9f4840

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

modules/nw-operator-cr.adoc

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,6 @@ endif::[]
2525
ifeval::["{context}" == "post-install-network-configuration"]
2626
:post-install-network-configuration:
2727
endif::[]
28-
ifeval::["{context}" == "installing-ibm-z"]
29-
:ibm-z:
30-
endif::[]
31-
ifeval::["{context}" == "installing-ibm-z-kvm"]
32-
:ibm-z:
33-
endif::[]
34-
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
35-
:ibm-z:
36-
endif::[]
37-
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
38-
:ibm-z:
39-
endif::[]
4028

4129
[id="nw-operator-cr_{context}"]
4230
= Cluster Network Operator configuration
@@ -266,7 +254,6 @@ ifdef::operator[]
266254
The UDP port for the Geneve overlay network.
267255
endif::operator[]
268256

269-
ifndef::ibm-z[]
270257
|`ipsecConfig`
271258
|`object`
272259
|
@@ -276,7 +263,6 @@ endif::operator[]
276263
ifdef::operator[]
277264
If the field is present, IPsec is enabled for the cluster.
278265
endif::operator[]
279-
endif::ibm-z[]
280266

281267
|`policyAuditConfig`
282268
|`object`
@@ -327,9 +313,7 @@ defaultNetwork:
327313
ovnKubernetesConfig:
328314
mtu: 1400
329315
genevePort: 6081
330-
ifndef::ibm-z[]
331316
ipsecConfig: {}
332-
endif::ibm-z[]
333317
----
334318

335319
[discrete]
@@ -409,15 +393,3 @@ endif::[]
409393
ifdef::post-install-network-configuration[]
410394
:!post-install-network-configuration:
411395
endif::[]
412-
ifeval::["{context}" == "installing-ibm-z"]
413-
:!ibm-z:
414-
endif::[]
415-
ifeval::["{context}" == "installing-ibm-z-kvm"]
416-
:!ibm-z:
417-
endif::[]
418-
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
419-
:!ibm-z:
420-
endif::[]
421-
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
422-
:!ibm-z:
423-
endif::[]

0 commit comments

Comments
 (0)