From a053eb5e3cbbbe87fa1c7c1cdaa70a735d9b9821 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 10 Apr 2015 10:23:50 +0200 Subject: [PATCH] Use Open vSwitch instead of OVS Use full name for Open vSwitch. Change-Id: I7ca44e55893e3c9eef8795883fb65a5862f1d5fb --- .../source/config_ml2_plug_in.rst | 2 +- .../source/scenario-l3ha-ovs.rst | 36 ++++++++--------- .../source/scenario-ovs-providernet.rst | 40 +++++++++---------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/doc/networking-guide/source/config_ml2_plug_in.rst b/doc/networking-guide/source/config_ml2_plug_in.rst index 01e159fb15..dcd33b37da 100644 --- a/doc/networking-guide/source/config_ml2_plug_in.rst +++ b/doc/networking-guide/source/config_ml2_plug_in.rst @@ -51,7 +51,7 @@ Mechanism * Option stanza/section -* OVS +* Open vSwitch * Option stanza/section diff --git a/doc/networking-guide/source/scenario-l3ha-ovs.rst b/doc/networking-guide/source/scenario-l3ha-ovs.rst index ca268a1ea4..1f50bb286a 100644 --- a/doc/networking-guide/source/scenario-l3ha-ovs.rst +++ b/doc/networking-guide/source/scenario-l3ha-ovs.rst @@ -45,14 +45,14 @@ Server hardware requirements deploy an odd quantity of network nodes with a minimum of three nodes. .. figure:: ./figures/scenario-l3ha-hw.png - :alt: L3 HA OVS scenario - hardware requirements + :alt: L3 HA Open vSwitch scenario - hardware requirements - L3 HA OVS scenario - hardware requirements + L3 HA Open vSwitch scenario - hardware requirements .. figure:: ./figures/scenario-l3ha-networks.png - :alt: L3 HA OVS scenario - network layout + :alt: L3 HA Open vSwitch scenario - network layout - L3 HA OVS scenario - network layout + L3 HA Open vSwitch scenario - network layout .. note:: @@ -110,9 +110,9 @@ Compute nodes dependencies including the ``ipset`` utility. .. figure:: ./figures/scenario-l3ha-ovs-services.png - :alt: L3 HA OVS scenario - service layout + :alt: L3 HA Open vSwitch scenario - service layout - L3 HA OVS scenario - service layout + L3 HA Open vSwitch scenario - service layout OpenVSwitch Layer 3 architecture for high availability ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -129,24 +129,24 @@ bandwidth constraints that limit performance. Consider deploying DVR to increase performance. .. figure:: ./figures/scenario-l3ha-general.png - :alt: L3 HA OVS scenario - architecture overview + :alt: L3 HA Open vSwitch scenario - architecture overview - L3 HA OVS scenario - architecture overview + L3 HA Open vSwitch scenario - architecture overview The network nodes run the Open vSwitch agent, L3 agent, DHCP agent, and metadata agent. .. figure:: ./figures/scenario-l3ha-ovs-network1.png - :alt: L3 HA OVS scenario - network node overview + :alt: L3 HA Open vSwitch scenario - network node overview - L3 HA OVS scenario - network node overview + L3 HA Open vSwitch scenario - network node overview The compute nodes run the Open vSwitch agent. .. figure:: ./figures/scenario-l3ha-ovs-compute1.png - :alt: L3 HA OVS scenario - compute node overview + :alt: L3 HA Open vSwitch scenario - compute node overview - L3 HA OVS scenario - compute node overview + L3 HA Open vSwitch scenario - compute node overview Node components --------------- @@ -168,9 +168,9 @@ The network node contains the following components: * Metadata agent handling metadata operations. .. figure:: ./figures/scenario-l3ha-ovs-network2.png - :alt: L3 HA OVS scenario - network node components + :alt: L3 HA Open vSwitch scenario - network node components - L3 HA OVS scenario - network node components + L3 HA Open vSwitch scenario - network node components The compute nodes contain the following components: @@ -183,9 +183,9 @@ The compute nodes contain the following components: to manage security groups for instances. .. figure:: ./figures/scenario-l3ha-ovs-compute2.png - :alt: L3 HA OVS scenario - compute node components + :alt: L3 HA Open vSwitch scenario - compute node components - L3 HA OVS scenario - compute node components + L3 HA Open vSwitch scenario - compute node components Packet flow ~~~~~~~~~~~ @@ -199,9 +199,9 @@ Failover operations .. TODO: Placeholder for failover operations discussion. .. figure:: ./figures/scenario-l3ha-ovs-flowfailover1.png - :alt: L3 HA OVS scenario - failover operations + :alt: L3 HA Open vSwitch scenario - failover operations - L3 HA OVS scenario - failover operations + L3 HA Open vSwitch scenario - failover operations Example configuration template ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/networking-guide/source/scenario-ovs-providernet.rst b/doc/networking-guide/source/scenario-ovs-providernet.rst index de512d557c..a82355164b 100644 --- a/doc/networking-guide/source/scenario-ovs-providernet.rst +++ b/doc/networking-guide/source/scenario-ovs-providernet.rst @@ -60,14 +60,14 @@ Requirements ``br-ex`` must contain a port on the external interface. .. figure:: figures/scenario-provider-hw.png - :alt: Provider OVS scenario - hardware requirements + :alt: Provider Open vSwitch scenario - hardware requirements - Provider OVS scenario - hardware requirements + Provider Open vSwitch scenario - hardware requirements .. figure:: figures/scenario-provider-networks.png - :alt: Provider OVS scenario - network layout + :alt: Provider Open vSwitch scenario - network layout - Provider OVS scenario - network layout + Provider Open vSwitch scenario - network layout Prerequisites ------------- @@ -112,9 +112,9 @@ The general provider network architecture uses physical network infrastructure to handle switching and routing of network traffic. .. figure:: figures/scenario-provider-general.png - :alt: Provider OVS scenario - architecture overview + :alt: Provider Open vSwitch scenario - architecture overview - Provider OVS scenario - architecture overview + Provider Open vSwitch scenario - architecture overview The network architecture for a provider networking from the OpenStack perspective is fairly simple since the OpenStack cluster is being @@ -127,16 +127,16 @@ The controller node runs the Open vSwitch service, Open vSwitch agent, and DHCP agent. .. figure:: figures/scenario-provider-ovs-controller1.png - :alt: Provider OVS scenario - controller node overview + :alt: Provider Open vSwitch scenario - controller node overview - Provider OVS Scenario - Controller node overview + Provider Open vSwitch Scenario - Controller node overview The compute node runs the Open vSwitch service and Open vSwitch agent. .. figure:: figures/scenario-provider-ovs-compute1.png - :alt: Provider OVS scenario - network node overview + :alt: Provider Open vSwitch scenario - network node overview - Provider OVS Scenario - Network node overview + Provider Open vSwitch Scenario - Network node overview Components ~~~~~~~~~~ @@ -153,9 +153,9 @@ The controller node contains the following components: provider networks. .. figure:: figures/scenario-provider-ovs-controller2.png - :alt: Provider OVS scenario - controller node components + :alt: Provider Open vSwitch scenario - controller node components - Provider OVS scenario - controller node components + Provider Open vSwitch scenario - controller node components The compute nodes contain the following components: @@ -169,15 +169,15 @@ The compute nodes contain the following components: service uses a Linux bridge to manage security groups for instances. .. figure:: figures/scenario-provider-ovs-compute2.png - :alt: Provider OVS scenario - compute node components + :alt: Provider Open vSwitch scenario - compute node components - Provider OVS scenario - compute node components + Provider Open vSwitch scenario - compute node components -Packet Flow +Packet flow ----------- The flow of packets in a provider network scenario only contains -complexity inside the compute node's OVS networking. Neutron allocates +complexity inside the compute node's Open vSwitch networking. Neutron allocates internal VLAN tags for each Neutron Network and provides a mapping between the internal VLAN tag used for a Neutron network, and then inserts rules in the Open vSwitch switching infrastructure to rewrite @@ -196,17 +196,17 @@ Case 1: North-south ~~~~~~~~~~~~~~~~~~~ .. figure:: figures/scenario-provider-ovs-flowns1.png - :alt: Provider OVS scenario - network traffic flow - north/south + :alt: Provider Open vSwitch scenario - network traffic flow - north/south - Provider OVS scenario - network traffic flow - north/south + Provider Open vSwitch scenario - network traffic flow - north/south Case 2: East-west ~~~~~~~~~~~~~~~~~ .. figure:: figures/scenario-provider-ovs-flowew1.png - :alt: Provider OVS scenario - network traffic flow - east/west + :alt: Provider Open vSwitch scenario - network traffic flow - east/west - Provider OVS Scenario - network traffic flow - east/west + Provider Open vSwitch Scenario - network traffic flow - east/west Example configuration template ------------------------------