fix a/an and repeated words

[pve-docs.git] / pve-network.adoc

diff --git a/pve-network.adoc b/pve-network.adoc
index 102bb8ed1e23ed72e33d8107ed9f888230a7a334..d5b0a483c88c8211e7a3531a5d695d50c19eb7d9 100644 (file)
--- a/pve-network.adoc
+++ b/pve-network.adoc
@@ -20,7 +20,7 @@ virtual networks.
 
 Debian traditionally uses the `ifup` and `ifdown` commands to
 configure the network. The file `/etc/network/interfaces` contains the
-whole network setup. Please refer to to manual page (`man interfaces`)
+whole network setup. Please refer to the manual page (`man interfaces`)
 for a complete format description.
 
 NOTE: {pve} does not write changes directly to
@@ -41,7 +41,7 @@ We currently use the following naming conventions for device names:
 
 * New Ethernet devices: en*, systemd network interface names.
 
-* Lagacy Ethernet devices: eth[N], where 0 ≤ N (`eth0`, `eth1`, ...)
+* Legacy Ethernet devices: eth[N], where 0 ≤ N (`eth0`, `eth1`, ...)
 They are available when Proxmox VE has been updated by an earlier version.
 
 * Bridge names: vmbr[N], where 0 ≤ N ≤ 4094 (`vmbr0` - `vmbr4094`)
@@ -54,20 +54,13 @@ They are available when Proxmox VE has been updated by an earlier version.
 This makes it easier to debug networks problems, because the device
 names implies the device type.
 
+
 Systemd Network Interface Names
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Two character prefixes based on the type of interface:
-
-* en — Enoernet
-
-* sl — serial line IP (slip)
-
-* wl — wlan
-
-* ww — wwan
-
-The next characters depence on the device driver and the fact which schema matches first.
+Systemd uses the two character prefix 'en' for Ethernet network
+devices. The next characters depends on the device driver and the fact
+which schema matches first.
 
 * o<index>[n<phys_port_name>|d<dev_port>] — devices on board
 
@@ -77,20 +70,21 @@ The next characters depence on the device driver and the fact which schema match
 
 * x<MAC> — device by MAC address
 
-The most common patterns are
+The most common patterns are:
 
 * eno1 — is the first on board NIC
 
 * enp3s0f1 — is the NIC on pcibus 3 slot 0 and use the NIC function 1.
 
-For more information see link:https://github.com/systemd/systemd/blob/master/src/udev/udev-builtin-net_id.c#L20[Systemd Network Interface Names]
+For more information see https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/[Predictable Network Interface Names].
+
 
 Default Configuration using a Bridge
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The installation program creates a single bridge named `vmbr0`, which
-is connected to the first ethernet card `eno0`. The corresponding
-configuration in `/etc/network/interfaces` looks like this:
+is connected to the first Ethernet card. The corresponding
+configuration in `/etc/network/interfaces` might look like this:
 
 ----
 auto lo
@@ -143,6 +137,7 @@ iface eno1 inet static
         address  192.168.10.2
         netmask  255.255.255.0
         gateway  192.168.10.1
+        post-up echo 1 > /proc/sys/net/ipv4/ip_forward
         post-up echo 1 > /proc/sys/net/ipv4/conf/eno1/proxy_arp
 
 
@@ -167,7 +162,7 @@ auto lo
 iface lo inet loopback
 
 auto eno0
-#real IP adress 
+#real IP address
 iface eno1 inet static
         address  192.168.10.2
         netmask  255.255.255.0
@@ -252,8 +247,13 @@ slaves in the single logical bonded interface such that different
 network-peers use different MAC addresses for their network packet
 traffic.
 
-For the most setups the active-backup are the best choice or if your
-switch support LACP "IEEE 802.3ad" this mode should be preferred.
+If your switch support the LACP (IEEE 802.3ad) protocol then we recommend using
+the corresponding bonding mode (802.3ad). Otherwise you should generally use the 
+active-backup mode. +
+// http://lists.linux-ha.org/pipermail/linux-ha/2013-January/046295.html
+If you intend to run your cluster network on the bonding interfaces, then you
+have to use active-passive mode on the bonding interfaces, other modes are
+unsupported.
 
 The following bond configuration can be used as distributed/shared
 storage network. The benefit would be that you get more speed and the
@@ -281,7 +281,7 @@ auto vmbr0
 iface vmbr0 inet static
         address  10.10.10.2
         netmask  255.255.255.0
-       gateway  10.10.10.1
+        gateway  10.10.10.1
         bridge_ports eno1
         bridge_stp off
         bridge_fd 0
@@ -302,7 +302,7 @@ iface eno1 inet manual
 iface eno2 inet manual
 
 auto bond0
-iface bond0 inet maunal
+iface bond0 inet manual
       slaves eno1 eno2
       bond_miimon 100
       bond_mode 802.3ad
@@ -312,7 +312,7 @@ auto vmbr0
 iface vmbr0 inet static
         address  10.10.10.2
         netmask  255.255.255.0
-       gateway  10.10.10.1
+        gateway  10.10.10.1
         bridge_ports bond0
         bridge_stp off
         bridge_fd 0
@@ -321,5 +321,5 @@ iface vmbr0 inet static
 
 ////
 TODO: explain IPv6 support?
-TODO: explan OVS
+TODO: explain OVS
 ////