diff mbox

[ovs-dev,1/3] doc: Resolve issues with Windows guide

Message ID 20161221203954.26353-1-stephen@that.guru
State Accepted
Headers show

Commit Message

Stephen Finucane Dec. 21, 2016, 8:39 p.m. UTC 
The formatting of this file was broken in a recent commit. Resolve this
issue.

Signed-off-by: Stephen Finucane <stephen@that.guru>
Fixes: a0c03adff6c2 ("Windows: document multiple NIC support setup")
Cc: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
---
 Documentation/intro/install/windows.rst | 116 +++++++++++++++++---------------
 1 file changed, 62 insertions(+), 54 deletions(-)

Comments

Ben Pfaff Dec. 21, 2016, 9:37 p.m. UTC | #1 
On Wed, Dec 21, 2016 at 08:39:52PM +0000, Stephen Finucane wrote:
> The formatting of this file was broken in a recent commit. Resolve this
> issue.
> 
> Signed-off-by: Stephen Finucane <stephen@that.guru>
> Fixes: a0c03adff6c2 ("Windows: document multiple NIC support setup")
> Cc: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>

Thanks for the patches!  I applied all of them to master.
diff mbox

Patch

diff --git a/Documentation/intro/install/windows.rst b/Documentation/intro/install/windows.rst
index 463f30f..6d65f06 100644
--- a/Documentation/intro/install/windows.rst
+++ b/Documentation/intro/install/windows.rst
@@ -498,64 +498,72 @@  found at technet_.
 
 .. _technet: https://technet.microsoft.com/en-us/library/jj553812%28v=wps.630%29.aspx
 
-I.e.::
-We will set up a switch team combined from ``Ethernet0 2`` and ``Ethernet1 2``
-named ``external``.
-
-PS > Get-NetAdapter
-Name                      InterfaceDescription
-----                      --------------------
-br-int                    Hyper-V Virtual Ethernet Adapter #3
-br-pif                    Hyper-V Virtual Ethernet Adapter #2
-Ethernet3 2               Intel(R) 82574L Gigabit Network Co...#3
-Ethernet2 2               Intel(R) 82574L Gigabit Network Co...#4
-Ethernet1 2               Intel(R) 82574L Gigabit Network Co...#2
-Ethernet0 2               Intel(R) 82574L Gigabit Network Conn...
-
-PS > New-NetSwitchTeam -Name external -TeamMembers "Ethernet0 2","Ethernet1 2"
-PS > Get-NetSwitchTeam
-Name    : external
-Members : {Ethernet1 2, Ethernet0 2}
-
-This will result in a new adapter bound to the host called ``external``
-
-PS > Get-NetAdapter
-
-Name                      InterfaceDescription
-----                      --------------------
-br-test                   Hyper-V Virtual Ethernet Adapter #4
-br-pif                    Hyper-V Virtual Ethernet Adapter #2
-external                  Microsoft Network Adapter Multiplexo...
-Ethernet3 2               Intel(R) 82574L Gigabit Network Co...#3
-Ethernet2 2               Intel(R) 82574L Gigabit Network Co...#4
-Ethernet1 2               Intel(R) 82574L Gigabit Network Co...#2
-Ethernet0 2               Intel(R) 82574L Gigabit Network Conn...
-
-Next we will set up the Hyper-V VMSwitch on the new adapter ``external``
-
-PS > New-VMSwitch -Name external -NetAdapterName external \
-     -AllowManagementOS $false
+For example, to set up a switch team combined from ``Ethernet0 2`` and
+``Ethernet1 2`` named ``external``:
+
+.. code-block:: powershell
+
+   PS > Get-NetAdapter
+   Name                      InterfaceDescription
+   ----                      --------------------
+   br-int                    Hyper-V Virtual Ethernet Adapter #3
+   br-pif                    Hyper-V Virtual Ethernet Adapter #2
+   Ethernet3 2               Intel(R) 82574L Gigabit Network Co...#3
+   Ethernet2 2               Intel(R) 82574L Gigabit Network Co...#4
+   Ethernet1 2               Intel(R) 82574L Gigabit Network Co...#2
+   Ethernet0 2               Intel(R) 82574L Gigabit Network Conn...
+
+   PS > New-NetSwitchTeam -Name external -TeamMembers "Ethernet0 2","Ethernet1 2"
+   PS > Get-NetSwitchTeam
+   Name    : external
+   Members : {Ethernet1 2, Ethernet0 2}
+
+This will result in a new adapter bound to the host called ``external``:
+
+.. code-block:: powershell
+
+   PS > Get-NetAdapter
+
+   Name                      InterfaceDescription
+   ----                      --------------------
+   br-test                   Hyper-V Virtual Ethernet Adapter #4
+   br-pif                    Hyper-V Virtual Ethernet Adapter #2
+   external                  Microsoft Network Adapter Multiplexo...
+   Ethernet3 2               Intel(R) 82574L Gigabit Network Co...#3
+   Ethernet2 2               Intel(R) 82574L Gigabit Network Co...#4
+   Ethernet1 2               Intel(R) 82574L Gigabit Network Co...#2
+   Ethernet0 2               Intel(R) 82574L Gigabit Network Conn...
+
+Next we will set up the Hyper-V VMSwitch on the new adapter ``external``:
+
+.. code-block:: powershell
+
+   PS > New-VMSwitch -Name external -NetAdapterName external \
+        -AllowManagementOS $false
 
 Under OVS the adapters under the team ``external``, ``Ethernet0 2`` and
 ``Ethernet1 2``, can be added either under a bond device or separately.
 
-The following example shows how the bridges look with the NICs being separated::
-
-> ovs-vsctl show
-
-6cd9481b-c249-4ee3-8692-97b399dd29d8
-    Bridge br-test
-        Port br-test
-            Interface br-test
-                type: internal
-        Port "Ethernet1 2"
-            Interface "Ethernet1 2"
-    Bridge br-pif
-        Port "Ethernet0 2"
-            Interface "Ethernet0 2"
-        Port br-pif
-            Interface br-pif
-                type: internal
+The following example shows how the bridges look with the NICs being
+separated:
+
+.. code-block:: powershell
+
+   PS > ovs-vsctl show
+
+   6cd9481b-c249-4ee3-8692-97b399dd29d8
+       Bridge br-test
+           Port br-test
+               Interface br-test
+                   type: internal
+           Port "Ethernet1 2"
+               Interface "Ethernet1 2"
+       Bridge br-pif
+           Port "Ethernet0 2"
+               Interface "Ethernet0 2"
+           Port br-pif
+               Interface br-pif
+                   type: internal
 
 Add patch ports and configure VLAN tagging
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~