From 2567fb84e9a7a10fc3d3243d0fa224f228afa790 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 18 Oct 2016 21:03:32 +0100 Subject: doc: Convert IntegrationGuide to rST Signed-off-by: Stephen Finucane Signed-off-by: Russell Bryant --- ovn/CONTAINERS.OpenStack.md | 4 ++-- ovn/ovn-architecture.7.xml | 6 +++--- ovn/ovn-sb.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ovn') 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 @@
  • One or more (usually many) hypervisors. Hypervisors must run Open vSwitch and implement the interface described in - IntegrationGuide.md in the OVS source tree. Any hypervisor + IntegrationGuide.rst in the OVS source tree. Any hypervisor platform supported by Open vSwitch is acceptable.
    • @@ -295,7 +295,7 @@
  • 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 IntegrationGuide.md) takes care of + hypervisor (described in IntegrationGuide.rst) 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 @@
  • 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 IntegrationGuide.md) adds the VIF + Open vSwitch (described in IntegrationGuide.rst) adds the VIF to the OVN integration bridge and stores vif-id in external_ids:iface-id 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 ovn-controller/ovn-controller-vtep in turn finds out by monitoring the local hypervisor's Open_vSwitch database, which identifies logical ports via the conventions described - in IntegrationGuide.md. (The exceptions are for + in IntegrationGuide.rst. (The exceptions are for Port_Binding records with type of l3gateway, whose locations are identified by ovn-northd via the options:l3gateway-chassis -- cgit v1.2.1