Skip to content

Commit a4aba51

Browse files
committed
OSDOCS-3625: Add support for user-provisioned IPv6 on metal
This support was always intended for user-provisioned, but was initially added for installer-provisioned which was documented by a different team. So this adds it back in here now that it is supported officially on user-provisioned. - https://issues.redhat.com/browse/OSDOCS-3625
1 parent 57e3f6d commit a4aba51

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
@@ -283,11 +283,7 @@ You can customize your installation configuration based on the requirements of y
283283
// But only for installer-provisioned
284284
// https://bugzilla.redhat.com/show_bug.cgi?id=2020416
285285
// Once BM UPI supports dual-stack, uncomment all the following conditionals and blocks
286-
//ifndef::bare[]
287-
Only IPv4 addresses are supported.
288-
////
289-
endif::bare[]
290-
ifdef::bare[]
286+
291287
If you use the OVN-Kubernetes cluster network provider, both IPv4 and IPv6 address families are supported.
292288

293289
If you use the OpenShift SDN cluster network provider, only the IPv4 address family is supported.
@@ -304,14 +300,12 @@ networking:
304300
clusterNetwork:
305301
- cidr: 10.128.0.0/14
306302
hostPrefix: 23
307-
- cidr: fd00:10:128::/56
303+
- cidr: fd01::/48
308304
hostPrefix: 64
309305
serviceNetwork:
310306
- 172.30.0.0/16
311307
- fd00:172:16::/112
312308
----
313-
endif::bare[]
314-
////
315309

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

349343
[source,yaml]
350344
----
351-
//ifndef::bare[]
352345
networking:
353346
clusterNetwork:
354347
- cidr: 10.128.0.0/14
355348
hostPrefix: 23
356-
//endif::bare[]
357-
//ifdef::bare[]
358-
//networking:
359-
// clusterNetwork:
360-
// - cidr: 10.128.0.0/14
361-
// hostPrefix: 23
362-
// - cidr: fd01::/48
363-
// hostPrefix: 64
364-
//endif::bare[]
349+
- cidr: fd01::/48
350+
hostPrefix: 64
365351
----
366352

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

371-
//ifndef::bare[]
372-
An IPv4 network.
373-
//endif::bare[]
374-
//ifdef::bare[]
375-
//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.
376-
//endif::bare[]
357+
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.
377358
|
378359
An IP address block in Classless Inter-Domain Routing (CIDR) notation.
379360
The prefix length for an IPv4 block is between `0` and `32`.
380-
//ifdef::bare[]
381-
//The prefix length for an IPv6 block is between `0` and `128`. For example, `10.128.0.0/14` or `fd01::/48`.
382-
//endif::bare[]
361+
The prefix length for an IPv6 block is between `0` and `128`. For example, `10.128.0.0/14` or `fd01::/48`.
383362

384363
|`networking.clusterNetwork.hostPrefix`
385364
|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.
386365
|
387366
A subnet prefix.
388367

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

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

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

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

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

410382
[source,yaml]
411383
----
412-
//ifndef::bare[]
413384
networking:
414385
serviceNetwork:
415386
- 172.30.0.0/16
416-
//endif::bare[]
417-
//ifdef::bare[]
418-
//networking:
419-
// serviceNetwork:
420-
// - 172.30.0.0/16
421-
// - fd02::/112
422-
//endif::bare[]
387+
- fd02::/112
423388
----
424389

425390
|`networking.machineNetwork`
@@ -446,12 +411,7 @@ Required if you use `networking.machineNetwork`. An IP address block. The defaul
446411
|
447412
An IP network block in CIDR notation.
448413

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

456416
[NOTE]
457417
====

0 commit comments

Comments
 (0)