Skip to content

Commit ade8f7c

Browse files
authored
Merge pull request #82822 from dfitzmau/OSDOCS-12045
OSDOCS-12045: Updated the Network config. parameters doc to include OSP
2 parents 965ccea + 614176f commit ade8f7c

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

modules/installation-configuration-parameters.adoc

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -182,16 +182,11 @@ endif::ibm-power-vs[]
182182

183183
You can customize your installation configuration based on the requirements of your existing network infrastructure. For example, you can expand the IP address block for the cluster network or provide different IP address blocks than the defaults.
184184

185-
// OSDOCS-1640 - IPv4/IPv6 dual-stack bare metal only
186-
// But only for installer-provisioned
187-
// https://bugzilla.redhat.com/show_bug.cgi?id=2020416
188-
// Once BM UPI supports dual-stack, uncomment all the following conditionals and blocks
189-
190-
ifndef::agent,bare,ibm-power,ibm-z,vsphere[]
185+
ifndef::agent,bare,ibm-power,ibm-z,vsphere,osp[]
191186
Only IPv4 addresses are supported.
192-
endif::agent,bare,ibm-power,ibm-z,vsphere[]
187+
endif::agent,bare,ibm-power,ibm-z,vsphere,osp[]
193188

194-
ifdef::agent,bare,ibm-power,ibm-z,vsphere[]
189+
ifdef::agent,bare,ibm-power,ibm-z,vsphere,osp[]
195190
Consider the following information before you configure network parameters for your cluster:
196191

197192
* If you use the {openshift-networking} OVN-Kubernetes network plugin, both IPv4 and IPv6 address families are supported.
@@ -209,7 +204,7 @@ endif::ibm-cloud[]
209204
ifdef::vsphere[]
210205
[NOTE]
211206
====
212-
On VMware vSphere, dual-stack networking can specify either IPv4 or IPv6 as the primary address family.
207+
On {vmw-first}, dual-stack networking can specify either IPv4 or IPv6 as the primary address family.
213208
====
214209
endif::vsphere[]
215210

@@ -220,7 +215,7 @@ If you configure your cluster to use both IP address families, review the follow
220215
* Both IP families must have the default gateway.
221216

222217
* You must specify IPv4 and IPv6 addresses in the same order for all network configuration parameters. For example, in the following configuration IPv4 addresses are listed before IPv6 addresses.
223-
218+
+
224219
[source,yaml]
225220
----
226221
networking:
@@ -233,12 +228,14 @@ networking:
233228
- 172.30.0.0/16
234229
- fd00:172:16::/112
235230
----
236-
endif::agent,bare,ibm-power,ibm-z,vsphere[]
231+
endif::agent,bare,ibm-power,ibm-z,vsphere,osp[]
237232

233+
ifdef::osp[]
238234
[NOTE]
239235
====
240-
Globalnet is not supported with {rh-storage-first} disaster recovery solutions. For regional disaster recovery scenarios, ensure that you use a nonoverlapping range of private IP addresses for the cluster and service networks in each cluster.
236+
Globalnet is not supported with {rh-storage-first} disaster recovery solutions. For regional disaster recovery scenarios, ensure that you use a non-overlapping range of private IP addresses for the cluster and service networks in each cluster.
241237
====
238+
endif::osp[]
242239

243240
.Network parameters
244241
[cols=".^2l,.^3a,.^3a",options="header"]

0 commit comments

Comments
 (0)