Skip to content

Commit 7c02cf9

Browse files
authored
Merge pull request #100927 from openshift-cherrypick-robot/cherry-pick-98303-to-enterprise-4.20
[enterprise-4.20] OCPBUGS-60895 small correction in metallb docs
2 parents 03032ab + 8559ba4 commit 7c02cf9

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

modules/nw-metallb-configure-secondary-interface.adoc

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ $ oc patch network.operator cluster -p '{"spec":{"defaultNetwork":{"ovnKubernete
3535
+
3636
[source,terminal]
3737
----
38-
$ echo -e "net.ipv4.conf.bridge-net.forwarding = 1\nnet.ipv6.conf.bridge-net.forwarding = 1\nnet.ipv4.conf.bridge-net.rp_filter = 0\nnet.ipv6.conf.bridge-net.rp_filter = 0" | base64 -w0
38+
$ echo -e "net.ipv4.conf.bridge-net.forwarding = 1" | base64 -w0
3939
----
4040
+
4141
.Example output
4242
+
4343
[source,terminal]
4444
----
45-
bmV0LmlwdjQuY29uZi5icmlkZ2UtbmV0LmZvcndhcmRpbmcgPSAxCm5ldC5pcHY2LmNvbmYuYnJpZGdlLW5ldC5mb3J3YXJkaW5nID0gMQpuZXQuaXB2NC5jb25mLmJyaWRnZS1uZXQucnBfZmlsdGVyID0gMApuZXQuaXB2Ni5jb25mLmJyaWRnZS1uZXQucnBfZmlsdGVyID0gMAo=
45+
bmV0LmlwdjQuY29uZi5icmlkZ2UtbmV0LmZvcndhcmRpbmcgPSAxCg==
4646
----
4747

4848
.. Create the `MachineConfig` CR to enable IP forwarding for the specified secondary interface named `bridge-net`.
@@ -64,7 +64,7 @@ spec:
6464
storage:
6565
files:
6666
- contents:
67-
source: data:text/plain;charset=utf-8;base64,bmV0LmlwdjQuY29uZi5icmlkZ2UtbmV0LmZvcndhcmRpbmcgPSAxCm5ldC5pcHY2LmNvbmYuYnJpZGdlLW5ldC5mb3J3YXJkaW5nID0gMQpuZXQuaXB2NC5jb25mLmJyaWRnZS1uZXQucnBfZmlsdGVyID0gMApuZXQuaXB2Ni5jb25mLmJyaWRnZS1uZXQucnBfZmlsdGVyID0gMAo= <2>
67+
source: data:text/plain;charset=utf-8;base64,bmV0LmlwdjQuY29uZi5icmlkZ2UtbmV0LmZvcndhcmRpbmcgPSAxCg== <2>
6868
verification: {}
6969
filesystem: root
7070
mode: 420
@@ -114,18 +114,15 @@ $ cat /etc/sysctl.d/enable-global-forwarding.conf
114114
[source,terminal]
115115
----
116116
net.ipv4.conf.bridge-net.forwarding = 1
117-
net.ipv6.conf.bridge-net.forwarding = 1
118-
net.ipv4.conf.bridge-net.rp_filter = 0
119-
net.ipv6.conf.bridge-net.rp_filter = 0
120117
----
121118
+
122-
The output indicates that IPv4 and IPv6 packet forwarding is enabled on the `bridge-net` interface.
119+
The output indicates that IPv4 forwarding is enabled on the `bridge-net` interface.
123120

124121
[id="nw-enabling-ip-forwarding-globally_{context}"]
125122
== Enabling IP forwarding globally
126123

127124
* Enable IP forwarding globally by running the following command:
128-
125+
+
129126
[source,terminal]
130127
----
131128
$ oc patch network.operator cluster -p '{"spec":{"defaultNetwork":{"ovnKubernetesConfig":{"gatewayConfig":{"ipForwarding": "Global"}}}}}' --type=merge

0 commit comments

Comments
 (0)