Skip to content

Commit 7222384

Browse files
authored
Merge pull request #6858 from okurz/fix/docs
docs: Fix wrapping and typo
2 parents 1726ff6 + b1d1323 commit 7222384

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

docs/Networking.asciidoc

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,14 @@ assigned by the openQA scheduler.
100100
The name of the bridge (default: `br1`) will be set in
101101
`/etc/sysconfig/os-autoinst-openvswitch`.
102102

103-
A huge part of the magic happens in os-autoinst-openvswitch.
104-
On startup this daemon will create flow rules in the OVS bridge that allow the
105-
SUT VMs to talk to upstream networks despite being in a VLAN to isolate from other tests.
106-
These flow rules implement an address translation from the SUT IPs to intermediate IPs
107-
so that it doesn't matter if multiple tests are running at the same time with conflicting IP addresses.
108-
These intermediate IP addresses can then be NATed (again) to upstream networks by regular
109-
iptables/NFT masquerading rules.
103+
A huge part of the magic happens in os-autoinst-openvswitch. On startup this
104+
daemon will create flow rules in the OVS bridge that allow the SUT VMs to talk
105+
to upstream networks despite being in a VLAN to isolate from other tests.
106+
These flow rules implement an address translation from the SUT IPs to
107+
intermediate IPs so that it doesn't matter if multiple tests are running at
108+
the same time with conflicting IP addresses. These intermediate IP addresses
109+
can then be NATed (again) to upstream networks by regular iptables/NFT
110+
masquerading rules.
110111

111112
===== Configure virtual interfaces
112113

@@ -121,9 +122,10 @@ for further information.
121122

122123
===== Configure NAT with firewalld
123124

124-
NOTE: `os-autoinst-setup-multi-machine` can set this up for you, but using plain NFT instead
125-
(which `os-autoinst-setup-multi-machine` can setup as well) of firewalld is recommended
126-
due to firewalld's suboptimal performance with many tap interfaces present.
125+
NOTE: `os-autoinst-setup-multi-machine` can set this up for you, but using
126+
plain NFT instead (which `os-autoinst-setup-multi-machine` can setup as well)
127+
or firewalld is recommended due to firewalld's suboptimal performance with
128+
many tap interfaces present.
127129

128130
The required firewall rules for masquerading (NAT) and zone configuration
129131
for the trusted zone will be set up. The bridge devices will be added to

0 commit comments

Comments
 (0)