summaryrefslogtreecommitdiff
path: root/ovn
diff options
context:
space:
mode:
authorStephen Finucane <stephen@that.guru>2016-10-18 21:03:32 +0100
committerRussell Bryant <russell@ovn.org>2016-10-20 13:14:29 -0400
commit2567fb84e9a7a10fc3d3243d0fa224f228afa790 (patch)
treed8218243355f06a47f79fc56531ebe0c9add3d87 /ovn
parentd124a408a4bc26672428427f561e324171359160 (diff)
downloadopenvswitch-2567fb84e9a7a10fc3d3243d0fa224f228afa790.tar.gz
doc: Convert IntegrationGuide to rST
Signed-off-by: Stephen Finucane <stephen@that.guru> Signed-off-by: Russell Bryant <russell@ovn.org>
Diffstat (limited to 'ovn')
-rw-r--r--ovn/CONTAINERS.OpenStack.md4
-rw-r--r--ovn/ovn-architecture.7.xml6
-rw-r--r--ovn/ovn-sb.xml2
3 files changed, 6 insertions, 6 deletions
diff --git a/ovn/CONTAINERS.OpenStack.md b/ovn/CONTAINERS.OpenStack.md
index d640d7c48..8f74e6fe3 100644
--- a/ovn/CONTAINERS.OpenStack.md
+++ b/ovn/CONTAINERS.OpenStack.md
@@ -22,7 +22,7 @@ interface (VIF) of VM-A.
* When VM-A is created on a hypervisor, its VIF gets added to the
Open vSwitch integration bridge. This creates a row in the Interface table
-of the Open_vSwitch database. As explained in the [IntegrationGuide.md],
+of the Open_vSwitch database. As explained in the [IntegrationGuide.rst],
the vif-id associated with the VM network interface gets added in the
external_ids:iface-id column of the newly created row in the Interface table.
@@ -119,4 +119,4 @@ a MAC address and IP address for that interface. ovn-docker will then create
a veth pair, insert one end inside the container as 'eth0' and the other end
as a port of a local OVS bridge as an access port of the chosen VLAN.
-[IntegrationGuide.md]:IntegrationGuide.md
+[IntegrationGuide.rst]:IntegrationGuide.rst
diff --git a/ovn/ovn-architecture.7.xml b/ovn/ovn-architecture.7.xml
index de2a376d0..bc5dfb771 100644
--- a/ovn/ovn-architecture.7.xml
+++ b/ovn/ovn-architecture.7.xml
@@ -42,7 +42,7 @@
<li>
One or more (usually many) <dfn>hypervisors</dfn>. Hypervisors must run
Open vSwitch and implement the interface described in
- <code>IntegrationGuide.md</code> in the OVS source tree. Any hypervisor
+ <code>IntegrationGuide.rst</code> in the OVS source tree. Any hypervisor
platform supported by Open vSwitch is acceptable.
</li>
@@ -295,7 +295,7 @@
<li>
On a hypervisor, any VIFs that are to be attached to logical networks.
The hypervisor itself, or the integration between Open vSwitch and the
- hypervisor (described in <code>IntegrationGuide.md</code>) takes care of
+ hypervisor (described in <code>IntegrationGuide.rst</code>) takes care of
this. (This is not part of OVN or new to OVN; this is pre-existing
integration work that has already been done on hypervisors that support
OVS.)
@@ -445,7 +445,7 @@
<li>
Eventually, a user powers on the VM that owns the VIF. On the hypervisor
where the VM is powered on, the integration between the hypervisor and
- Open vSwitch (described in <code>IntegrationGuide.md</code>) adds the VIF
+ Open vSwitch (described in <code>IntegrationGuide.rst</code>) adds the VIF
to the OVN integration bridge and stores <var>vif-id</var> in
<code>external_ids</code>:<code>iface-id</code> to indicate that the
interface is an instantiation of the new VIF. (None of this code is new
diff --git a/ovn/ovn-sb.xml b/ovn/ovn-sb.xml
index b484f59a0..4e0047a8b 100644
--- a/ovn/ovn-sb.xml
+++ b/ovn/ovn-sb.xml
@@ -1593,7 +1593,7 @@ tcp.flags = RST;
which <code>ovn-controller</code>/<code>ovn-controller-vtep</code> in
turn finds out by monitoring the local hypervisor's Open_vSwitch
database, which identifies logical ports via the conventions described
- in <code>IntegrationGuide.md</code>. (The exceptions are for
+ in <code>IntegrationGuide.rst</code>. (The exceptions are for
<code>Port_Binding</code> records with <code>type</code> of
<code>l3gateway</code>, whose locations are identified by
<code>ovn-northd</code> via the <code>options:l3gateway-chassis</code>