Skip to content

Commit 31bac1e

Browse files
authored
Merge pull request #47636 from jboxman-rh/OSDOCS-3625
OSDOCS-3625: Add support for user-provisioned IPv6 on metal
2 parents 27fff7c + a4aba51 commit 31bac1e

File tree

1 file changed

+11
-51
lines changed

1 file changed

+11
-51
lines changed

modules/installation-configuration-parameters.adoc

Lines changed: 11 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,7 @@ You can customize your installation configuration based on the requirements of y
282282
// But only for installer-provisioned
283283
// https://bugzilla.redhat.com/show_bug.cgi?id=2020416
284284
// Once BM UPI supports dual-stack, uncomment all the following conditionals and blocks
285-
//ifndef::bare[]
286-
Only IPv4 addresses are supported.
287-
////
288-
endif::bare[]
289-
ifdef::bare[]
285+
290286
If you use the OVN-Kubernetes cluster network provider, both IPv4 and IPv6 address families are supported.
291287

292288
If you use the OpenShift SDN cluster network provider, only the IPv4 address family is supported.
@@ -303,14 +299,12 @@ networking:
303299
clusterNetwork:
304300
- cidr: 10.128.0.0/14
305301
hostPrefix: 23
306-
- cidr: fd00:10:128::/56
302+
- cidr: fd01::/48
307303
hostPrefix: 64
308304
serviceNetwork:
309305
- 172.30.0.0/16
310306
- fd00:172:16::/112
311307
----
312-
endif::bare[]
313-
////
314308

315309
.Network parameters
316310
[cols=".^2,.^3a,.^3a",options="header"]
@@ -347,78 +341,49 @@ If you specify multiple IP address blocks, the blocks must not overlap.
347341

348342
[source,yaml]
349343
----
350-
//ifndef::bare[]
351344
networking:
352345
clusterNetwork:
353346
- cidr: 10.128.0.0/14
354347
hostPrefix: 23
355-
//endif::bare[]
356-
//ifdef::bare[]
357-
//networking:
358-
// clusterNetwork:
359-
// - cidr: 10.128.0.0/14
360-
// hostPrefix: 23
361-
// - cidr: fd01::/48
362-
// hostPrefix: 64
363-
//endif::bare[]
348+
- cidr: fd01::/48
349+
hostPrefix: 64
364350
----
365351

366352
|`networking.clusterNetwork.cidr`
367353
|
368354
Required if you use `networking.clusterNetwork`. An IP address block.
369355

370-
//ifndef::bare[]
371-
An IPv4 network.
372-
//endif::bare[]
373-
//ifdef::bare[]
374-
//If you use the OpenShift SDN network provider, specify an IPv4 network. If you use the OVN-Kubernetes network provider, you can specify IPv4 and IPv6 networks.
375-
//endif::bare[]
356+
If you use the OpenShift SDN network provider, specify an IPv4 network. If you use the OVN-Kubernetes network provider, you can specify IPv4 and IPv6 networks.
376357
|
377358
An IP address block in Classless Inter-Domain Routing (CIDR) notation.
378359
The prefix length for an IPv4 block is between `0` and `32`.
379-
//ifdef::bare[]
380-
//The prefix length for an IPv6 block is between `0` and `128`. For example, `10.128.0.0/14` or `fd01::/48`.
381-
//endif::bare[]
360+
The prefix length for an IPv6 block is between `0` and `128`. For example, `10.128.0.0/14` or `fd01::/48`.
382361

383362
|`networking.clusterNetwork.hostPrefix`
384363
|The subnet prefix length to assign to each individual node. For example, if `hostPrefix` is set to `23` then each node is assigned a `/23` subnet out of the given `cidr`. A `hostPrefix` value of `23` provides 510 (2^(32 - 23) - 2) pod IP addresses.
385364
|
386365
A subnet prefix.
387366

388-
//ifndef::bare[]
389-
The default value is `23`.
390-
//endif::bare[]
391-
//ifdef::bare[]
392-
//For an IPv4 network the default value is `23`.
393-
//For an IPv6 network the default value is `64`. The default value is also the minimum value for IPv6.
394-
//endif::bare[]
367+
For an IPv4 network the default value is `23`.
368+
For an IPv6 network the default value is `64`. The default value is also the minimum value for IPv6.
395369

396370
|`networking.serviceNetwork`
397371
|
398372
The IP address block for services. The default value is `172.30.0.0/16`.
399373

400374
The OpenShift SDN and OVN-Kubernetes network providers support only a single IP address block for the service network.
401375

402-
//ifdef::bare[]
403-
//If you use the OVN-Kubernetes network provider, you can specify an IP address block for both of the IPv4 and IPv6 address families.
404-
//endif::bare[]
376+
If you use the OVN-Kubernetes network provider, you can specify an IP address block for both of the IPv4 and IPv6 address families.
405377

406378
|
407379
An array with an IP address block in CIDR format. For example:
408380

409381
[source,yaml]
410382
----
411-
//ifndef::bare[]
412383
networking:
413384
serviceNetwork:
414385
- 172.30.0.0/16
415-
//endif::bare[]
416-
//ifdef::bare[]
417-
//networking:
418-
// serviceNetwork:
419-
// - 172.30.0.0/16
420-
// - fd02::/112
421-
//endif::bare[]
386+
- fd02::/112
422387
----
423388

424389
|`networking.machineNetwork`
@@ -445,12 +410,7 @@ Required if you use `networking.machineNetwork`. An IP address block. The defaul
445410
|
446411
An IP network block in CIDR notation.
447412

448-
//ifndef::bare[]
449-
For example, `10.0.0.0/16`.
450-
//endif::bare[]
451-
//ifdef::bare[]
452-
//For example, `10.0.0.0/16` or `fd00::/48`.
453-
//endif::bare[]
413+
For example, `10.0.0.0/16` or `fd00::/48`.
454414

455415
[NOTE]
456416
====

0 commit comments

Comments
 (0)