From 795752a3cf5a598ebb6a6f7656c9ccf05c8175f4 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 8 Dec 2016 12:55:24 +0000 Subject: doc: Populate 'install', 'howto' sections This is a dumb move of all 'INSTALL*' docs, with very little refactoring (mostly updating links and making the titles a little more consistent. Additional refactoring will be done in subsequent changes. Signed-off-by: Stephen Finucane Signed-off-by: Ben Pfaff --- tutorial/ovn-tutorial.rst | 5 +++-- tutorial/tutorial.rst | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'tutorial') diff --git a/tutorial/ovn-tutorial.rst b/tutorial/ovn-tutorial.rst index 8d9fc1a43..bb5f6201f 100644 --- a/tutorial/ovn-tutorial.rst +++ b/tutorial/ovn-tutorial.rst @@ -873,11 +873,12 @@ of what the resulting OpenFlow flows look like. Container Ports --------------- +.. TODO(stephenfin): Update Docker link when this is moved. + OVN supports containers running directly on the hypervisors and running containers inside VMs. This example shows how OVN supports network virtualization to containers when run inside VMs. Details about how to use -docker containers in OVS can be found in the `Docker installlation guide -<../INSTALL.Docker.rst>`__. +docker containers in OVS can be found in the `Docker installlation guide`. To support container traffic created inside a VM and to distinguish network traffic coming from different container vifs, for each container a logical port diff --git a/tutorial/tutorial.rst b/tutorial/tutorial.rst index fab635030..422bc0d61 100644 --- a/tutorial/tutorial.rst +++ b/tutorial/tutorial.rst @@ -54,6 +54,8 @@ hardware or even supervisor privilege on your system. Instead, we will use a script called ``ovs-sandbox``, which accompanies the tutorial, that constructs a software simulated network environment based on Open vSwitch. +.. TODO(stephenfin): Update installation guide link when this is moved. + You can use ``ovs-sandbox`` three ways: * If you have already installed Open vSwitch on your system, then you should be @@ -61,9 +63,9 @@ You can use ``ovs-sandbox`` three ways: * If you have not installed Open vSwitch (and you do not want to install it), then you can build Open vSwitch according to the instructions in the - `installation guide `__, without installing it. Then run - ``./ovs-sandbox -b DIRECTORY`` from this directory, substituting the Open - vSwitch build directory for ``DIRECTORY``. + `installation guide`, without installing it. Then run ``./ovs-sandbox -b + DIRECTORY`` from this directory, substituting the Open vSwitch build + directory for ``DIRECTORY``. * As a slight variant on the latter, you can run ``make sandbox`` from an Open vSwitch build directory. -- cgit v1.2.1