diff --git a/doc/common-rst/source/locale/common-rst.pot b/doc/common-rst/source/locale/common-rst.pot index 522a7b9b8a..e2e41d9869 100644 --- a/doc/common-rst/source/locale/common-rst.pot +++ b/doc/common-rst/source/locale/common-rst.pot @@ -503,6 +503,13 @@ msgid "" "a complete report of the service's current state, and is sent to ``stderr``." msgstr "" +#: ../common/support-compute.rst:49 +msgid "" +"A Guru Meditation report is sent by the Compute service upon receipt of the " +"``SIGUSR1`` signal. This report is a general-purpose error report, including " +"a complete report of the service's current state, and is sent to ``stderr``." +msgstr "" + #: ../common/glossary.rst:220 msgid "A Java program that can be embedded into a web page." msgstr "" @@ -1142,6 +1149,14 @@ msgid "" "reapers." msgstr "" +#: ../common/get_started_image_service.rst:14 +msgid "" +"A number of periodic processes run on the OpenStack Image service to support " +"caching. Replication services ensure consistency and availability through " +"the cluster. Other periodic processes include auditors, updaters, and " +"reapers." +msgstr "" + #: ../common/glossary.rst:2943 ../common/glossary.rst:2950 msgid "" "A number within a database that is incremented each time a change is made. " @@ -3219,6 +3234,13 @@ msgid "" "Service." msgstr "" +#: ../common/get_started_identity.rst:29 +msgid "" +"Data that confirms the user's identity. For example: user name and password, " +"user name and API key, or an authentication token provided by the Identity " +"service." +msgstr "" + #: ../common/glossary.rst:912 msgid "" "Data that is only known to or accessible by a user and used to verify that " @@ -3854,6 +3876,12 @@ msgid "" "packages Service::" msgstr "" +#: ../common/cli_install_openstack_command_line_clients.rst:213 +msgid "" +"For openSUSE, use zypper to install the clients from the distribution " +"packages service::" +msgstr "" + #: ../common/app_support.rst:16 msgid "" "For the available OpenStack documentation, see `docs.openstack.org \n" +"PO-Revision-Date: 2015-07-14 14:01+0000\n" +"Last-Translator: openstackjenkins \n" "Language-Team: Japanese (http://www.transifex.com/p/openstack-manuals-i18n/" "language/ja/)\n" "MIME-Version: 1.0\n" @@ -5073,6 +5073,9 @@ msgstr "OpenStack Identity の概念" msgid "OpenStack Image Service" msgstr "OpenStack Image Service" +msgid "OpenStack Image service" +msgstr "OpenStack Image service" + msgid "OpenStack Networking" msgstr "OpenStack Networking" diff --git a/doc/common/locale/common.pot b/doc/common/locale/common.pot index 0eedc338f6..ea6b987a6a 100644 --- a/doc/common/locale/common.pot +++ b/doc/common/locale/common.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-07-14 06:13+0000\n" +"POT-Creation-Date: 2015-07-15 06:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -5641,7 +5641,7 @@ msgid "Some systems require that you enable VT support in the system BIOS. If yo msgstr "" #: ./doc/common/section_kvm_enable.xml:75(para) -msgid "If KVM acceleration is not supported, configure Compute to use a different hypervisor, such as QEMU or Xen." +msgid "If KVM acceleration is not supported, configure Compute to use a different hypervisor, such as QEMU or Xen." msgstr "" #: ./doc/common/section_kvm_enable.xml:81(para) diff --git a/doc/common/locale/ja.po b/doc/common/locale/ja.po index a76eb65d6b..5263cb91d1 100644 --- a/doc/common/locale/ja.po +++ b/doc/common/locale/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenStack Manuals\n" -"POT-Creation-Date: 2015-07-13 21:05+0000\n" -"PO-Revision-Date: 2015-07-14 00:21+0000\n" +"POT-Creation-Date: 2015-07-15 05:02+0000\n" +"PO-Revision-Date: 2015-07-15 05:03+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Japanese (http://www.transifex.com/p/openstack-manuals-i18n/" "language/ja/)\n" @@ -1679,6 +1679,9 @@ msgstr "OpenStack Compute" msgid "OpenStack Identity concepts" msgstr "OpenStack Identity の概念" +msgid "OpenStack Image service" +msgstr "OpenStack Image service" + msgid "OpenStack Networking" msgstr "OpenStack Networking" diff --git a/doc/config-reference/locale/config-reference.pot b/doc/config-reference/locale/config-reference.pot index 5d3412f0a7..a418133973 100644 --- a/doc/config-reference/locale/config-reference.pot +++ b/doc/config-reference/locale/config-reference.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-07-13 06:17+0000\n" +"POT-Creation-Date: 2015-07-15 06:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -145,7 +145,7 @@ msgstr "" msgid "Cloud end users can find out how to resize a server by reading the OpenStack End User Guide." msgstr "" -#: ./doc/config-reference/ch_computeconfigure.xml:77(title) ./doc/config-reference/compute/section_introduction-to-xen.xml:59(title) +#: ./doc/config-reference/ch_computeconfigure.xml:77(title) ./doc/config-reference/compute/section_hypervisor_xen_api.xml:59(title) msgid "XenServer" msgstr "" @@ -1893,188 +1893,6 @@ msgstr "" msgid "To customize the Compute scheduler, use the configuration option settings documented in ." msgstr "" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:156(None) -msgid "@@image: '../../common/figures/xenserver_architecture.png'; md5=99792432daf7f0302672fb8f03cb63bb" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:8(title) -msgid "Xen, XAPI, XenServer" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:9(para) -msgid "This section describes XAPI managed hypervisors, and how to use them with OpenStack." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:14(title) -msgid "Terminology" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:16(title) -msgid "Xen" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:17(para) -msgid "A hypervisor that provides the fundamental isolation between virtual machines. Xen is open source (GPLv2) and is managed by Xen.org, a cross-industry organization and a Linux Foundation Collaborative project." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:23(para) -msgid "Xen is a component of many different products and projects. The hypervisor itself is very similar across all these projects, but the way that it is managed can be different, which can cause confusion if you're not clear which toolstack you are using. Make sure you know what toolstack you want before you get started." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:33(title) -msgid "XAPI" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:34(para) -msgid "XAPI is one of the toolstacks that could control a Xen based hypervisor. XAPI's role is similar to libvirt's in the KVM world. The API provided by XAPI is called XenAPI. To learn more about the provided interface, look at XenAPI Object Model Overview for definitions of XAPI specific terms such as SR, VDI, VIF and PIF." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:46(para) -msgid "OpenStack has a compute driver which talks to XAPI, therefore all XAPI managed servers could be used with OpenStack." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:52(title) -msgid "XenAPI" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:53(para) -msgid "XenAPI is the API provided by XAPI. This name is also used by the python library that is a client for XAPI." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:60(para) -msgid "An Open Source virtualization platform that delivers all features needed for any server and datacenter implementation including the Xen hypervisor and XAPI for the management. For more information and product downloads, visit xenserver.org ." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:72(title) -msgid "XCP" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:73(para) -msgid "XCP is not supported anymore. XCP project recommends all XCP users to upgrade to the latest version of XenServer by visiting xenserver.org ." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:83(title) -msgid "XenServer-core" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:84(para) -msgid "This is a method for building the core packages in a XenServer installation on an existing RPM-based system. Initial support for this configuration (notably running Compute services in domain 0) was added in Havana. XenServer-core for Debian/Ubuntu is built from the main branch and, therefore, is continuously up to date." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:93(title) -msgid "Kronos" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:94(para) -msgid "This is a project initiated to provide the ability to install XAPI toolstack onto an existing Debian-based deployment. For more information, visit the Xen wiki wiki.xen.org/wiki/Project_Kronos ." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:105(title) -msgid "Privileged and unprivileged domains" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:106(para) -msgid "A Xen host runs a number of virtual machines, VMs, or domains (the terms are synonymous on Xen). One of these is in charge of running the rest of the system, and is known as domain 0, or dom0. It is the first domain to boot after Xen, and owns the storage and networking hardware, the device drivers, and the primary control software. Any other VM is unprivileged, and is known as a domU or guest. All customer VMs are unprivileged, but you should note that on Xen, the OpenStack Compute service (nova-compute) also runs in a domU. This gives a level of security isolation between the privileged system software and the OpenStack software (much of which is customer-facing). This architecture is described in more detail later." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:123(title) -msgid "Paravirtualized versus hardware virtualized domains" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:124(para) -msgid "A Xen virtual machine can be paravirtualized (PV) or hardware virtualized (HVM). This refers to the interaction between Xen, domain 0, and the guest VM's kernel. PV guests are aware of the fact that they are virtualized and will co-operate with Xen and domain 0; this gives them better performance characteristics. HVM guests are not aware of their environment, and the hardware has to pretend that they are running on an unvirtualized machine. HVM guests do not need to modify the guest operating system, which is essential when running Windows." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:136(para) -msgid "In OpenStack, customer VMs may run in either PV or HVM mode. However, the OpenStack domU (that's the one running nova-compute) must be running in PV mode." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:145(title) -msgid "XenAPI deployment architecture" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:148(para) -msgid "A basic OpenStack deployment on a XAPI-managed server, assuming that the network provider is nova-network, looks like this: " -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:165(para) -msgid "The hypervisor: Xen" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:170(para) -msgid "Domain 0: runs XAPI and some small pieces from OpenStack, the XAPI plug-ins." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:176(para) -msgid "OpenStack VM: The Compute service runs in a paravirtualized virtual machine, on the host under management. Each host runs a local instance of Compute. It is also running an instance of nova-network." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:187(para) -msgid "OpenStack Compute uses the XenAPI Python library to talk to XAPI, and it uses the Management Network to reach from the OpenStack VM to Domain 0." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:161(para) -msgid "Key things to note: " -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:199(para) -msgid "The above diagram assumes FlatDHCP networking." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:208(para) -msgid "Management network: RabbitMQ, MySQL, inter-host communication, and compute-XAPI communication. Please note that the VM images are downloaded by the XenAPI plug-ins, so make sure that the OpenStack Image service is accessible through this network. It usually means binding those services to the management interface." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:220(para) -msgid "Tenant network: controlled by nova-network, this is used for tenant traffic." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:227(para) -msgid "Public network: floating IPs, public API endpoints." -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:204(para) -msgid "There are three main OpenStack networks: " -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:236(para) -msgid "The networks shown here must be connected to the corresponding physical networks within the data center. In the simplest case, three individual physical network cards could be used. It is also possible to use VLANs to separate these networks. Please note, that the selected configuration must be in line with the networking model selected for the cloud. (In case of VLAN networking, the physical channels have to be able to forward the tagged traffic.)" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:195(para) -msgid "Some notes on the networking: " -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:252(title) -msgid "Further reading" -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:258(para) -msgid "Citrix XenServer official documentation: http://docs.vmd.citrix.com/XenServer " -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:267(para) -msgid "What is Xen? by Xen.org: http://xen.org/files/Marketing/WhatisXen.pdf " -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:276(para) -msgid "Xen Hypervisor project: http://www.xenproject.org/developers/teams/hypervisor.html " -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:285(para) -msgid "Xapi project: http://www.xenproject.org/developers/teams/xapi.html " -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:294(para) -msgid "Further XenServer and OpenStack information: http://wiki.openstack.org/XenServer " -msgstr "" - -#: ./doc/config-reference/compute/section_introduction-to-xen.xml:253(para) -msgid "Here are some of the resources available to learn more about Xen: " -msgstr "" - #: ./doc/config-reference/compute/section_compute-configure-backing-storage.xml:6(title) msgid "Configure Compute backing storage" msgstr "" @@ -3310,33 +3128,97 @@ msgid "Xen - XenServer, Xen Cloud Platform (XCP), use to run Linux or Windows virtual machines. You must install the nova-compute service in a para-virtualized VM." +msgid "Xen (using libvirt) - Xen Project Hypervisor using libvirt as management interface into nova-compute to run Linux, Windows, FreeBSD and NetBSD virtual machines." msgstr "" -#: ./doc/config-reference/compute/section_compute-hypervisors.xml:60(para) +#: ./doc/config-reference/compute/section_compute-hypervisors.xml:57(para) +msgid "XenServer - XenServer, Xen Cloud Platform (XCP) and other XAPI based Xen variants runs Linux or Windows virtual machines. You must install the nova-compute service in a para-virtualized VM." +msgstr "" + +#: ./doc/config-reference/compute/section_compute-hypervisors.xml:65(para) msgid " Hyper-V - Server virtualization with Microsoft's Hyper-V, use to run Windows, Linux, and FreeBSD virtual machines. Runs nova-compute natively on the Windows virtualization platform." msgstr "" -#: ./doc/config-reference/compute/section_compute-hypervisors.xml:70(title) +#: ./doc/config-reference/compute/section_compute-hypervisors.xml:75(title) msgid "Hypervisor configuration basics" msgstr "" -#: ./doc/config-reference/compute/section_compute-hypervisors.xml:71(para) +#: ./doc/config-reference/compute/section_compute-hypervisors.xml:76(para) msgid "The node where the nova-compute service is installed and operates on the same node that runs all of the virtual machines. This is referred to as the compute node in this guide." msgstr "" -#: ./doc/config-reference/compute/section_compute-hypervisors.xml:75(para) +#: ./doc/config-reference/compute/section_compute-hypervisors.xml:80(para) msgid "By default, the selected hypervisor is KVM. To change to another hypervisor, change the virt_type option in the [libvirt] section of nova.conf and restart the nova-compute service." msgstr "" -#: ./doc/config-reference/compute/section_compute-hypervisors.xml:79(para) +#: ./doc/config-reference/compute/section_compute-hypervisors.xml:84(para) msgid "Here are the general nova.conf options that are used to configure the compute node's hypervisor: ." msgstr "" -#: ./doc/config-reference/compute/section_compute-hypervisors.xml:82(para) +#: ./doc/config-reference/compute/section_compute-hypervisors.xml:87(para) msgid "Specific options for particular hypervisors can be found in the following sections." msgstr "" +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:6(title) ./doc/config-reference/compute/section_compute-configure-xapi.xml:75(title) +msgid "XenAPI configuration reference" +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:7(para) +msgid "The following section discusses some commonly changed options when using the XenAPI driver. The table below provides a complete reference of all configuration options available for configuring XAPI with OpenStack." +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:13(para) +msgid "The recommended way to use XAPI with OpenStack is through the XenAPI driver. To enable the XenAPI driver, add the following configuration options to /etc/nova/nova.conf and restart OpenStack Compute:" +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:21(replaceable) +msgid "your_xenapi_management_ip_address" +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:23(replaceable) +msgid "your_password" +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:24(para) +msgid "These connection details are used by OpenStack Compute service to contact your hypervisor and are the same details you use to connect XenCenter, the XenServer management console, to your XenServer node." +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:30(para) +msgid "The connection_url is generally the management network IP address of the XenServer." +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:36(title) ./doc/config-reference/networking/section_networking-options-reference.xml:20(title) +msgid "Agent" +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:37(para) +msgid "The agent is a piece of software that runs on the instances, and communicates with OpenStack. In case of the XenAPI driver, the agent communicates with OpenStack through XenStore (see the Xen Project Wiki for more information on XenStore)." +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:44(para) +msgid "If you don't have the guest agent on your VMs, it takes a long time for OpenStack Compute to detect that the VM has successfully started. Generally a large timeout is required for Windows instances, but you may want to adjust: agent_version_timeout within the [xenserver] section." +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:54(title) +msgid "VNC proxy address" +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:55(para) +msgid "Assuming you are talking to XAPI through a management network, and XenServer is on the address: 10.10.1.34 specify the same address for the vnc proxy address: vncserver_proxyclient_address=10.10.1.34" +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:63(title) +msgid "Storage" +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:64(para) +msgid "You can specify which Storage Repository to use with nova by editing the following flag. To use the local-storage setup by the default installer: Another alternative is to use the \"default\" storage (for example if you have attached NFS or any other shared storage): " +msgstr "" + +#: ./doc/config-reference/compute/section_compute-configure-xapi.xml:76(para) +msgid "To customize the XenAPI driver, use the configuration option settings documented in ." +msgstr "" + #: ./doc/config-reference/compute/section_xapi-ami-setup.xml:8(title) msgid "Prepare for AMI type images" msgstr "" @@ -3509,6 +3391,182 @@ msgstr "" msgid "For a complete list of all available configuration options for each OpenStack Compute service, run bin/nova-<servicename> --help." msgstr "" +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:8(title) +msgid "Xen via Libvirt" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:9(para) +msgid "OpenStack Compute supports the Xen Project Hypervisor (or Xen). Xen can be integrated with OpenStack Compute via the libvirttoolstack or via the XAPItoolstack. This section describes how to set up OpenStack Compute with Xen and libvirt. For information on how to set up Xen with XAPI refer to ." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:17(title) +msgid "Installing Xen with Libvirt" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:18(para) +msgid "At this stage we recommend to use the baseline that we use for the Xen Project OpenStack CI Loop, which contains the most recent stability fixes to both Xen and Libvirt." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:22(para) +msgid "Xen 4.5.1 (or newer) and Libvirt 1.2.15 (or newer) contain the most recent OpenStack improvements for Xen. The necessary Xen changes have also been backported to the Xen 4.4.3 stable branch (not yet released at this stage). Please check with the Linux and FreeBSD distros you are intending to use as Dom 0, whether the relevant version of Xen and Libvirt are available as installable packages." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:32(para) +msgid "The latest releases of Xen and libvirt packages that fulfil the above minimum requirements for the various openSUSE distributions can always be found and installed from the Open Build Service Virtualization project. To install these latest packages, add the Virtualization repository to your software management stack and get the newest packages from there. More information about the latest Xen and Libvirt packages are avalable here and here." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:42(para) +msgid "Alternatively, it is possible to use the Ubuntu LTS 14.04 Xen Package 4.4.1-0ubuntu0.14.04.4 (Xen 4.4.1) and apply the patches outlined here. You can also use the Ubuntu LTS 14.04 libvirt package 1.2.2 libvirt_1.2.2-0ubuntu13.1.7 as baseline and update it to libvirt version 1.2.15, or 1.2.14 with the patches outlined here applied. Note that this will require re-build these packages partly from source." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:52(para) +msgid "For further information and latest developments, you may want to consult the Xen Project's mailing lists for OpenStack related issues and questions." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:58(title) +msgid "Configuring Xen with Libvirt" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:59(para) +msgid "To enable Xen via libvirt, ensure the following options are set in /etc/nova/nova.conf on all hosts running the nova-compute service." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:68(title) +msgid "Additional configuration options" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:69(para) +msgid "Use the following as a guideline for configuring Xen for use in OpenStack:" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:72(para) +msgid "Dom0 Memory: Set it between 1GB and 4GB by adding the following parameter to the Xen Boot Options in the grub.conf file. " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:77(para) +msgid "Note that the above memory limits are suggestions and should be based on the available compute host resources. For large hosts, that will run many hundred of instances,the chosen values may need to be higher." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:80(para) +msgid "The location of the grub.conf file depends on the host Linux distribution that you are using. Please refer to the distro documentation for more details (see Dom 0 for more resources)." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:86(para) +msgid "Dom0 vcpus: Set the virtual CPUs to 4 and employ CPU pinning by adding the following parameters to the Xen Boot Options in the grub.conf file. " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:92(para) +msgid "Note that the above virtual CPU limits are suggestions and should be based on the available compute host resources. For large hosts, that will run many hundred of instances, the suggested values may need to be higher." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:97(para) +msgid "PV vs HVM guests: A Xen virtual machine can be paravirtualized (PV) or hardware virtualized (HVM). The virtualization mode determines the interaction between Xen, Dom 0, and the guest VM's kernel. PV guests are aware of the fact that they are virtualized and will co-operate with Xen and Dom 0. The choice of virtualization mode determines performance characteristics. For an overview of Xen virtualization modes, see Xen Guest Types." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:105(para) +msgid "In OpenStack, customer VMs may run in either PV or HVM mode. The mode is a property of the operating system image used by the VM, and is changed by adjusting the image metadata stored in the glance image service. The image metadata can be changed using the nova or glance commands." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:110(para) +msgid "To choose one of the HVM modes (HVM, HVM with PV Drivers or PVHVM) use nova or glance to set the vm_mode property to hvm" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:115(replaceable) ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:116(replaceable) ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:119(replaceable) ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:120(replaceable) ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:141(replaceable) ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:142(replaceable) +msgid "img-uuid" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:113(para) +msgid "To choose one of the HVM modes (HVM, HVM with PV Drivers or PVHVM) use one of the following two commands To chose PV mode, which is supported by NetBSD, FreeBSD and Linux, useone of the following two commands " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:122(para) +msgid "The default for virtualization mode in nova is PV mode." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:125(para) +msgid "Image Formats: Xen supports raw, qcow2 and vhd image formats. For more information on image formats, refer to the OpenStack Virtual Image Guide and the Storage Options Guide on the Xen Project Wiki." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:133(para) +msgid "Image Metadata: In addition to the vm_mode property discussed above, the hypervisor_type property is another important component of the image metadata, especially if your cloud contains mixed hypervisor compute nodes. Setting the hypervisor_type property allows the nova scheduler to select a compute node running the specified hypervisor when launching instances of the image. Image metadata such as vm_mode, hypervisor_type, architecture, and others can be set when importing the image to glance. The metatdata can also be changed using the nova or glance commands: " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:144(para) +msgid "For more more information on image metadata, refer to the OpenStack Virtual Image Guide." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:150(para) +msgid "To customize the libvirt driver, use the configuration option settings documented in ." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:155(title) +msgid "Troubleshoot Xen with Libvirt" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:161(para) +msgid "/var/log/nova/compute.log (for more information refer to )." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:163(para) +msgid "/var/log/libvirt/libxl/libxl-driver.log," +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:164(para) +msgid "/var/log/xen/qemu-dm-${instancename}.log," +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:165(para) +msgid "/var/log/xen/xen-hotplug.log," +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:166(para) +msgid "/var/log/xen/console/guest-${instancename} (to enable see Enabling Guest Console Logs) and" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:170(para) +msgid "Host Console Logs (read Enabling and Retrieving Host Console Logs)." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:158(para) +msgid "Important Log Files: When an instance fails to start, or when you come across other issues, you should first consult the following log files: " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:176(para) +msgid "If you need further help you can ask questions on the mailing lists xen-users@, wg-openstack@ or raise a bug against Xen." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:187(title) +msgid "Known issues" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:190(para) +msgid "Xen via libvirt is currently only supported with nova networking. A number of bugs are currently worked on to make sure that Xen via libvirt will also work with Neutron." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:196(title) +msgid "Additional information and resources" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:197(para) +msgid "The following section contains links to other useful resources" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:200(para) +msgid "wiki.xenproject.org/wiki/OpenStack - OpenStack Documentation on the Xen Project wiki" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:205(para) +msgid "wiki.xenproject.org/wiki/OpenStack_CI_Loop_for_Xen-Libvirt - Information about the Xen Project OpenStack CI Loop" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:211(para) +msgid "wiki.xenproject.org/wiki/OpenStack_via_DevStack - How to set up OpenStack via DevStack" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:216(para) +msgid "Mailing lists for OpenStack related issues and questions - This list is dedicated to coordinating bug fixes and issues across Xen, libvirt and OpenStack and the CI loop." +msgstr "" + #: ./doc/config-reference/compute/section_nova-log-files.xml:7(title) msgid "Compute log files" msgstr "" @@ -3821,66 +3879,6 @@ msgstr "" msgid "The scheme can be either qpid or rabbit, as shown previously. The following sample shows this optional configuration:" msgstr "" -#: ./doc/config-reference/compute/section_xen-install.xml:7(title) -msgid "Install XenServer" -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:8(para) -msgid "Before you can run OpenStack with XenServer, you must install the hypervisor on an appropriate server ." -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:18(para) -msgid "Xen is a type 1 hypervisor: When your server starts, Xen is the first software that runs. Consequently, you must install XenServer before you install the operating system where you want to run OpenStack code. You then install nova-compute into a dedicated virtual machine on the host." -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:33(link) -msgid "http://xenserver.org/open-source-virtualization-download.html" -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:27(para) -msgid "Use the following link to download XenServer's installation media: " -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:40(para) -msgid "When you install many servers, you might find it easier to perform PXE boot installations . You can also package any post-installation changes that you want to make to your XenServer by following the instructions of creating your own XenServer supplemental pack ." -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:55(para) -msgid "Make sure you use the EXT type of storage repository (SR). Features that require access to VHD files (such as copy on write, snapshot and migration) do not work when you use the LVM SR. Storage repository (SR) is a XAPI-specific term relating to the physical storage where virtual disks are stored." -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:62(para) -msgid "On the XenServer installation screen, choose the XenDesktop Optimized option. If you use an answer file, make sure you use srtype=\"ext\" in the installation tag of the answer file." -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:73(title) -msgid "Post-installation steps" -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:74(para) -msgid "The following steps need to be completed after the hypervisor's installation:" -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:80(para) -msgid "For resize and migrate functionality, enable password-less SSH authentication and set up the /images directory on dom0." -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:88(para) -msgid "Install the XAPI plug-ins." -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:93(para) -msgid "To support AMI type images, you must set up /boot/guest symlink/directory in dom0." -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:100(para) -msgid "Create a paravirtualized virtual machine that can run nova-compute." -msgstr "" - -#: ./doc/config-reference/compute/section_xen-install.xml:106(para) -msgid "Install and configure nova-compute in the above virtual machine." -msgstr "" - #: ./doc/config-reference/compute/section_nova-conf.xml:7(title) msgid "Overview of nova.conf" msgstr "" @@ -4169,70 +4167,6 @@ msgstr "" msgid "Use these options to configure the RabbitMQ and Qpid messaging drivers." msgstr "" -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:6(title) -msgid "Xen configuration reference" -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:7(para) -msgid "The following section discusses some commonly changed options when using the XenAPI driver. The table below provides a complete reference of all configuration options available for configuring XAPI with OpenStack." -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:13(para) -msgid "The recommended way to use XAPI with OpenStack is through the XenAPI driver. To enable the XenAPI driver, add the following configuration options to /etc/nova/nova.conf and restart OpenStack Compute:" -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:21(replaceable) -msgid "your_xenapi_management_ip_address" -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:23(replaceable) -msgid "your_password" -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:24(para) -msgid "These connection details are used by OpenStack Compute service to contact your hypervisor and are the same details you use to connect XenCenter, the XenServer management console, to your XenServer node." -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:30(para) -msgid "The connection_url is generally the management network IP address of the XenServer." -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:36(title) ./doc/config-reference/networking/section_networking-options-reference.xml:20(title) -msgid "Agent" -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:37(para) -msgid "The agent is a piece of software that runs on the instances, and communicates with OpenStack. In case of the XenAPI driver, the agent communicates with OpenStack through XenStore (see the Xen Wiki for more information on XenStore)." -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:44(para) -msgid "If you don't have the guest agent on your VMs, it takes a long time for OpenStack Compute to detect that the VM has successfully started. Generally a large timeout is required for Windows instances, but you may want to adjust: agent_version_timeout within the [xenserver] section." -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:54(title) -msgid "VNC proxy address" -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:55(para) -msgid "Assuming you are talking to XAPI through a management network, and XenServer is on the address: 10.10.1.34 specify the same address for the vnc proxy address: vncserver_proxyclient_address=10.10.1.34" -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:63(title) -msgid "Storage" -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:64(para) -msgid "You can specify which Storage Repository to use with nova by editing the following flag. To use the local-storage setup by the default installer: Another alternative is to use the \"default\" storage (for example if you have attached NFS or any other shared storage): " -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:75(title) -msgid "XenAPI configuration reference" -msgstr "" - -#: ./doc/config-reference/compute/section_compute-configure-xen.xml:76(para) -msgid "To customize the XenAPI driver, use the configuration option settings documented in ." -msgstr "" - #: ./doc/config-reference/compute/section_compute-iscsioffload.xml:7(title) msgid "iSCSI interface and offload support in Compute" msgstr "" @@ -4473,6 +4407,188 @@ msgstr "" msgid "If it is not set to kvm, run:" msgstr "" +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:156(None) +msgid "@@image: '../../common/figures/xenserver_architecture.png'; md5=99792432daf7f0302672fb8f03cb63bb" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:8(title) +msgid "XenServer (and other XAPI based Xen variants)" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:9(para) +msgid "This section describes XAPI managed hypervisors, and how to use them with OpenStack." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:14(title) +msgid "Terminology" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:16(title) +msgid "Xen" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:17(para) +msgid "A hypervisor that provides the fundamental isolation between virtual machines. Xen is open source (GPLv2) and is managed by XenProject.org, a cross-industry organization and a Linux Foundation Collaborative project." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:24(para) +msgid "Xen is a component of many different products and projects. The hypervisor itself is very similar across all these projects, but the way that it is managed can be different, which can cause confusion if you're not clear which toolstack you are using. Make sure you know what toolstack you want before you get started. If you want to use Xen with libvirt in OpenStack Compute refer to ." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:33(title) +msgid "XAPI" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:34(para) +msgid "XAPI is one of the toolstacks that could control a Xen based hypervisor. XAPI's role is similar to libvirt's in the KVM world. The API provided by XAPI is called XenAPI. To learn more about the provided interface, look at XenAPI Object Model Overview for definitions of XAPI specific terms such as SR, VDI, VIF and PIF." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:46(para) +msgid "OpenStack has a compute driver which talks to XAPI, therefore all XAPI managed servers could be used with OpenStack." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:52(title) +msgid "XenAPI" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:53(para) +msgid "XenAPI is the API provided by XAPI. This name is also used by the python library that is a client for XAPI." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:60(para) +msgid "An Open Source virtualization platform that delivers all features needed for any server and datacenter implementation including the Xen hypervisor and XAPI for the management. For more information and product downloads, visit xenserver.org ." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:72(title) +msgid "XCP" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:73(para) +msgid "XCP is not supported anymore. XCP project recommends all XCP users to upgrade to the latest version of XenServer by visiting xenserver.org ." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:83(title) +msgid "XenServer-core" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:84(para) +msgid "This is a method for building the core packages in a XenServer installation on an existing RPM-based system. Initial support for this configuration (notably running Compute services in domain 0) was added in Havana. XenServer-core for Debian/Ubuntu is built from the main branch and, therefore, is continuously up to date." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:93(title) +msgid "Kronos" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:94(para) +msgid "This is a project initiated to provide the ability to install XAPI toolstack onto an existing Debian-based deployment. For more information, visit the Xen wiki wiki.xenproject.org/wiki/Project_Kronos ." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:105(title) +msgid "Privileged and unprivileged domains" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:106(para) +msgid "A Xen host runs a number of virtual machines, VMs, or domains (the terms are synonymous on Xen). One of these is in charge of running the rest of the system, and is known as domain 0, or dom0. It is the first domain to boot after Xen, and owns the storage and networking hardware, the device drivers, and the primary control software. Any other VM is unprivileged, and is known as a domU or guest. All customer VMs are unprivileged, but you should note that on Xen, the OpenStack Compute service (nova-compute) also runs in a domU. This gives a level of security isolation between the privileged system software and the OpenStack software (much of which is customer-facing). This architecture is described in more detail later." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:123(title) +msgid "Paravirtualized versus hardware virtualized domains" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:124(para) +msgid "A Xen virtual machine can be paravirtualized (PV) or hardware virtualized (HVM). This refers to the interaction between Xen, domain 0, and the guest VM's kernel. PV guests are aware of the fact that they are virtualized and will co-operate with Xen and domain 0; this gives them better performance characteristics. HVM guests are not aware of their environment, and the hardware has to pretend that they are running on an unvirtualized machine. HVM guests do not need to modify the guest operating system, which is essential when running Windows." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:136(para) +msgid "In OpenStack, customer VMs may run in either PV or HVM mode. However, the OpenStack domU (that's the one running nova-compute) must be running in PV mode." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:145(title) +msgid "XenAPI deployment architecture" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:148(para) +msgid "A basic OpenStack deployment on a XAPI-managed server, assuming that the network provider is nova-network, looks like this: " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:165(para) +msgid "The hypervisor: Xen" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:170(para) +msgid "Domain 0: runs XAPI and some small pieces from OpenStack, the XAPI plug-ins." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:176(para) +msgid "OpenStack VM: The Compute service runs in a paravirtualized virtual machine, on the host under management. Each host runs a local instance of Compute. It is also running an instance of nova-network." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:187(para) +msgid "OpenStack Compute uses the XenAPI Python library to talk to XAPI, and it uses the Management Network to reach from the OpenStack VM to Domain 0." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:161(para) +msgid "Key things to note: " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:199(para) +msgid "The above diagram assumes FlatDHCP networking." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:208(para) +msgid "Management network: RabbitMQ, MySQL, inter-host communication, and compute-XAPI communication. Please note that the VM images are downloaded by the XenAPI plug-ins, so make sure that the OpenStack Image service is accessible through this network. It usually means binding those services to the management interface." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:220(para) +msgid "Tenant network: controlled by nova-network, this is used for tenant traffic." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:227(para) +msgid "Public network: floating IPs, public API endpoints." +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:204(para) +msgid "There are three main OpenStack networks: " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:236(para) +msgid "The networks shown here must be connected to the corresponding physical networks within the data center. In the simplest case, three individual physical network cards could be used. It is also possible to use VLANs to separate these networks. Please note, that the selected configuration must be in line with the networking model selected for the cloud. (In case of VLAN networking, the physical channels have to be able to forward the tagged traffic.)" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:195(para) +msgid "Some notes on the networking: " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:252(title) +msgid "Further reading" +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:258(para) +msgid "Citrix XenServer official documentation: http://docs.vmd.citrix.com/XenServer " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:267(para) +msgid "What is Xen? by XenProject.org: XenProject.org > Users > Cloud " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:276(para) +msgid "Xen Hypervisor project: http://www.xenproject.org/developers/teams/hypervisor.html " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:285(para) +msgid "Xapi project: http://www.xenproject.org/developers/teams/xapi.html " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:294(para) +msgid "Further XenServer and OpenStack information: http://wiki.openstack.org/XenServer " +msgstr "" + +#: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:253(para) +msgid "Here are some of the resources available to learn more about Xen: " +msgstr "" + #: ./doc/config-reference/compute/section_compute-sample-configuration-files.xml:6(title) ./doc/config-reference/dashboard/section_dashboard-sample-configuration-files.xml:7(title) msgid "Additional sample configuration files" msgstr "" @@ -4541,6 +4657,66 @@ msgstr "" msgid "Remove temporary files/directories:" msgstr "" +#: ./doc/config-reference/compute/section_xapi-install.xml:7(title) +msgid "Install XenServer" +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:8(para) +msgid "Before you can run OpenStack with XenServer, you must install the hypervisor on an appropriate server ." +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:18(para) +msgid "Xen is a type 1 hypervisor: When your server starts, Xen is the first software that runs. Consequently, you must install XenServer before you install the operating system where you want to run OpenStack code. You then install nova-compute into a dedicated virtual machine on the host." +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:33(link) +msgid "http://xenserver.org/open-source-virtualization-download.html" +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:27(para) +msgid "Use the following link to download XenServer's installation media: " +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:40(para) +msgid "When you install many servers, you might find it easier to perform PXE boot installations . You can also package any post-installation changes that you want to make to your XenServer by following the instructions of creating your own XenServer supplemental pack ." +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:55(para) +msgid "Make sure you use the EXT type of storage repository (SR). Features that require access to VHD files (such as copy on write, snapshot and migration) do not work when you use the LVM SR. Storage repository (SR) is a XAPI-specific term relating to the physical storage where virtual disks are stored." +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:62(para) +msgid "On the XenServer installation screen, choose the XenDesktop Optimized option. If you use an answer file, make sure you use srtype=\"ext\" in the installation tag of the answer file." +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:73(title) +msgid "Post-installation steps" +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:74(para) +msgid "The following steps need to be completed after the hypervisor's installation:" +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:80(para) +msgid "For resize and migrate functionality, enable password-less SSH authentication and set up the /images directory on dom0." +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:88(para) +msgid "Install the XAPI plug-ins." +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:93(para) +msgid "To support AMI type images, you must set up /boot/guest symlink/directory in dom0." +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:100(para) +msgid "Create a paravirtualized virtual machine that can run nova-compute." +msgstr "" + +#: ./doc/config-reference/compute/section_xapi-install.xml:106(para) +msgid "Install and configure nova-compute in the above virtual machine." +msgstr "" + #: ./doc/config-reference/compute/section_compute-conductor.xml:7(title) msgid "Conductor" msgstr "" diff --git a/doc/image-guide/locale/zh_CN.po b/doc/image-guide/locale/zh_CN.po index 848de7e2f2..68464ca506 100644 --- a/doc/image-guide/locale/zh_CN.po +++ b/doc/image-guide/locale/zh_CN.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: OpenStack Manuals\n" -"POT-Creation-Date: 2015-07-09 05:22+0000\n" -"PO-Revision-Date: 2015-07-01 13:52+0000\n" -"Last-Translator: openstackjenkins \n" +"POT-Creation-Date: 2015-07-15 05:02+0000\n" +"PO-Revision-Date: 2015-07-15 05:03+0000\n" +"Last-Translator: 秋林 \n" "Language-Team: Chinese (China) (http://www.transifex.com/p/openstack-manuals-" "i18n/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -76,6 +76,96 @@ msgstr "2014-10-15" msgid "2015" msgstr "2015" +msgid "" +"BoxGrinder is another " +"tool for creating virtual machine images, which it calls appliances. " +"BoxGrinder can create Fedora, Red Hat Enterprise Linux, or CentOS images. " +"BoxGrinder is currently only supported on Fedora." +msgstr "" +"BoxGrinder 是另外一个创建" +"虚拟机镜像的工具,也称器具。BoxGrinder 可以创建 Fedora, Red Hat Enterprise " +"Linux, 或者 CentOS 镜像。BoxGrinder当前只支持在 Fedora 上运行。" + +msgid "" +"Diskimage-builder is an automated disk image creation tool that " +"supports a variety of distributions and architectures. Diskimage-builder " +"(DIB) can build images for Fedora, Red Hat Enterprise Linux, Ubuntu, Debian, " +"CentOS, and openSUSE. DIB is organized in a series of elements that build on " +"top of each other to create specific images." +msgstr "" +" " +"镜像生成器 是一个支持不同发行版以及体系架构的自动化磁盘镜像创建工具。" +"镜像生成器(DIB)能为 Fedora, Red Hat Enterprise Linux, Ubuntu, Debian, " +"CentOS, and openSUSE 生成镜像,DIB 是被组合一系列的工具之上的创建特殊镜像的基" +"础。" + +msgid "" +"imagefactory is a newer tool " +"designed to automate the building, converting, and uploading images to " +"different cloud providers. It uses Oz as its back-end and includes support " +"for OpenStack-based clouds." +msgstr "" +"imagefactory 是一个设计为自动" +"化创建,转换以及上传镜像到不同云提供商的较新的工具。他使用 Oz 做为后端,并支" +"持包含基于 OpenStack 的云。" + +msgid "" +"SUSE Studio is a web " +"application for building and testing software applications in a web browser. " +"It supports the creation of physical, virtual or cloud-based applications " +"and includes support for building images for OpenStack based clouds using " +"SUSE Linux Enterprise and openSUSE as distributions." +msgstr "" +"SUSE Studio 是创建和测试软" +"件程序的基于浏览器的 web 程序。他支持创建物理,虚拟或者基于云端的应用程序,并" +"且支持使用SUSE Linux Enterprise and openSUSE 发行版为基于 Openstack 的云创建" +"镜像。" + +msgid "" +"Oz is a " +"command-line tool that automates the process of creating a virtual machine " +"image file. Oz is a Python app that interacts with KVM to step through the " +"process of installing a virtual machine. It uses a predefined set of " +"kickstart (Red Hat-based systems) and preseed files (Debian-based systems) " +"for operating systems that it supports, and it can also be used to create " +"Microsoft Windows images. On Fedora, install Oz with yum:" +msgstr "" +"Oz 是一个" +"自动化创建镜像文件的命令行工具。它是一个和 KVM 进行交互完成整个虚拟机镜像安装" +"过程的 Python 程序。它使用操作系统支持的一系列预定义的 kickstart (红帽系)文件" +"或 preseed 文件 (Debian 系),并且他也用于创建微软 Windows 镜像。在 Fedora " +"上,使用 yum 安装 Oz:" + +msgid "" +" VeeWee is " +"often used to build Vagrant " +"boxes, but it can also be used to build KVM images." +msgstr "" +" VeeWee 通常" +"用于创建 Vagrant boxses,但" +"它也可用于创建 KVM 镜像。" + +msgid "" +"VMBuilder " +"(Virtual Machine Builder) is a command-line tool that creates virtual " +"machine images for different hypervisors. The version of VMBuilder that " +"ships with Ubuntu can only create Ubuntu virtual machine guests. The version " +"of VMBuilder that ships with Debian can create Ubuntu and Debian virtual " +"machine guests." +msgstr "" +"VMBuilder (虚拟机" +"生成器) 是一个可为不同 hypervisors 生成虚拟机镜像的命令行工具。Ubuntu 带的 " +"VMBuilder 版本只能创建 Ubuntu 虚拟机。 Debian 带的 VMBuilder 版本能创建 " +"Ubuntu 以及 Debian 虚拟机。" + +msgid "" +" Packer is a tool for creating " +"machine images for multiple platforms from a single source configuration." +msgstr "" +" Packer 是使用单一源配置生成不" +"同平台虚拟机镜像的工具。" + msgid "aki. An Amazon kernel image." msgstr "aki. Amazon 内核镜像。" @@ -214,6 +304,18 @@ msgid "" "an AMI file, AKI file, and ARI file." msgstr "UEC(Ubuntu 企业云) 文件是一个包含了 AMI AKI ARI文件的tar包压缩文件。" +msgid "" +"A full treatment of Oz is beyond the scope of this document, but we will " +"provide an example. You can find additional examples of Oz template files on " +"GitHub at rackerjoe/oz-image-build/templates. Here's " +"how you would create a CentOS 6.4 image with Oz." +msgstr "" +"完整的 Oz 示例 已经超出本文档范围,但是我们提供一个示例。你可以在 GitHub " +"rackerjoe/oz-image-build/templates.查找到额外的 Oz 模板文" +"件。下面演示了使用 Oz 如何创建 CentOS 6.4 镜像。" + msgid "" "A kernel file that the hypervisor will load initially to boot the image. For " "a Linux machine, this would be a vmlinuz file." @@ -255,6 +357,16 @@ msgstr "使用SSH 公钥访问虚拟机 (cloud-init)" msgid "Adds information about image formats, properties." msgstr "添加镜像格式,属性相关信息。" +msgid "" +"After Oz completes the initial OS install using the kickstart file, it " +"customizes the image with an update. It also removes any reference to the " +"eth0 device that libvirt creates while Oz does the customizing, as specified " +"in the command section of the XML file." +msgstr "" +"在 Oz 使用kickstart文件完成系统初始安装后,它通过更新镜像内容来定制镜像文件。" +"定制的过程它通过 在XML 文件中的 command 字段也删除任何关于" +"eth0设备的信息。" + msgid "" "After you exit, you can open a shell to complete manual configuration steps. " "Select Yes to make a few OpenStack-specific changes:" @@ -303,6 +415,13 @@ msgstr "" msgid "Argument to qemu-img" msgstr "qemu-img 参数" +msgid "" +"As of this writing, there are no Oz packages for Ubuntu, so you will need to " +"either install from the source or build your own .deb file." +msgstr "" +"在本文档编写时,没有针对 Ubuntu 的 Oz 安装包,因此你需要从源代码安装或者编译" +"自己的.deb文件包。" + msgid "" "As of this writing, we are not aware of other distributions that provide " "images for download." @@ -543,6 +662,14 @@ msgstr "在额外的空间上创建 LVM 分区。例如: 。" msgid "Create a new physical volume. For example, ." msgstr "创建新的物理卷(PV)。例如: 。" +msgid "" +"Create a template file (we'll call it centos64.tdl) " +"with the following contents. The only entry you will need to change is the " +"<rootpw> contents." +msgstr "" +"使用以下内容创建模板文件(我们叫做 centos64.tdl)。你仅" +"仅需要修改 <rootpw> 部分的内容。" + msgid "Create images manually" msgstr "手动创建镜像" @@ -598,6 +725,9 @@ msgstr "磁盘分区以及在启动时调整根分区大小 (cloud-init msgid "Disk partitions and resize root partition on boot (cloud-init)" msgstr "磁盘分区以及在启动时调整根分区大小 (cloud-init)" +msgid "Diskimage-builder" +msgstr "镜像生成器" + msgid "" "Do not attempt to use these tools to modify an image that is attached to a " "running virtual machine. These tools are designed to only modify images that " @@ -721,6 +851,11 @@ msgstr "" "从启动时需要启动的服务列表中选择 ssh 。以及可选的其他服务。" +msgid "" +"Further customization could be accomplished by setting environment variables " +"or adding elements to the command-line:" +msgstr "更进一步的镜像定制可以通过设置环境变量或者添加元素到命令行:" + msgid "Get images" msgstr "获取镜像" @@ -948,6 +1083,16 @@ msgstr "" "如果你不能使用libguestfs,你可以使用loop(环回)设备,kpartx,网络块设备直接挂载" "镜像文件系统到宿主机系统。" +msgid "" +"If you leave out the -u flag, or you want to edit the " +"file to do additional customizations, you can use the " +"command, using the libvirt XML file that creates. For " +"example:" +msgstr "" +"如果你忘记使用 -u 参数,或者你想编辑文件做额外的定制化," +"你可以使用 命令,来使用 创建的libvirt XML " +"文件,例如:" + msgid "" "If you modify this example, the root partition, which is mounted on " "/, must be the last partition on the drive so that it " @@ -1346,6 +1491,12 @@ msgstr "可选的,添加用户。" msgid "Oz" msgstr "Oz" +msgid "" +"Oz will invoke libvirt to boot the image inside of KVM, then Oz will ssh " +"into the instance and perform the customizations." +msgstr "" +"Oz 将调用 libvirt 通过 KVM 来启动镜像,然后Oz ssh 到虚拟机内完成定制化工作。" + msgid "Packer" msgstr "Packer" @@ -1658,6 +1809,15 @@ msgstr "" "裸格式镜像和块设备文件是二进制位相当的,就好像从块设备拷贝过来的,比方说,使" "用 命令将 /dev/sda 内容拷贝到一个文件。" +msgid "" +"The Ubuntu Server Guide has " +"documentation on how to use VMBuilder to create an Ubuntu image." +msgstr "" +"Ubuntu Server Guide 编写了如何" +"使用 VMBuilder 创建 Ubuntu 镜像。" + msgid "" "The -X flag passed to ssh will enable X11 forwarding over " "ssh. If this does not work, try replacing it with the -Y " @@ -1981,6 +2141,22 @@ msgstr "" "因此,如果你使用 Xen ,我们推荐当你创建镜像时,只建立一个 ext3 或者 ext4 分区" "(而且没有LVM管理)。否则,继续往下看。" +msgid "" +"This Oz template specifies where to download the Centos 6.4 install ISO. Oz " +"will use the version information to identify which kickstart file to use. In " +"this case, it will be RHEL6.auto. It adds EPEL as a " +"repository and install the epel-release, cloud-" +"utils, and cloud-init packages, as specified in " +"the packages section of the file." +msgstr "" +"Oz 模板指定了 Centos 6.4 安装 ISO 的下载位置。 Oz 使用版本信息确认了使用哪一" +"个 kickstart 文件。在这个示例中,是 RHEL6.auto 。它添加 " +"EPEL 软件库,并且安装在 packages 字段指定的 epel-" +"release, cloud-utils, 以及 cloud-init 包。" + msgid "This VM must also have Internet access to download packages." msgstr "虚拟机必须能访问 Internet 以便下载软件包。" @@ -1991,6 +2167,24 @@ msgstr "" "这个例子创建一个Windows Server 2012 qcow2镜像,使用以及KVM虚" "拟化。" +msgid "" +"This example creates a generic, bootable Ubuntu image of the latest release." +msgstr "这个示例创建了一个通用的,可启动的最新版本 Ubuntu 镜像。" + +msgid "" +"This example creates the image as before, but for arm architecture. More " +"elements are available in the git source directory and documented in the diskimage-builder elements " +"documentation." +msgstr "" +"这个示例使用之前创建的镜像,但是针对 ARM 结构,更多的基础元素参见 git 源目录 且文档参考 镜像生成器基础元素" +"文档。 " + msgid "" "This example installs a Ubuntu 14.04 (Trusty Tahr) image. To create an image " "for a different version of Ubuntu, follow these steps with the noted " @@ -2069,6 +2263,9 @@ msgstr "" "为了让Cloudbase-Init在系统启动时运行脚本,设置" "PowerShell执行策略解除限制。" +msgid "To build an image, call the following script:" +msgstr "要创建镜像,输入以下命令:" + msgid "To create a FreeBSD image" msgstr "创建 FreeBSD 镜像" @@ -2109,6 +2306,9 @@ msgid "" "\"virtual machine image\"." msgstr "为了简化,有时文档使用 \"镜像\" 代替 \"虚拟机镜像\" 。" +msgid "To run this:" +msgstr "运行:" + msgid "" "To see how the settings affect the deletion of a running instance, check the " "directory where the images are stored:" diff --git a/doc/networking-guide/source/locale/networking-guide.pot b/doc/networking-guide/source/locale/networking-guide.pot index 7ce21c2578..29e5c7d853 100644 --- a/doc/networking-guide/source/locale/networking-guide.pot +++ b/doc/networking-guide/source/locale/networking-guide.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Networking Guide 0.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-09 06:16+0000\n" +"POT-Creation-Date: 2015-07-15 06:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,12 +45,12 @@ msgid "" "the IP packets are being manipulated." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:153 ../deploy_scenario4b.rst:157 -#: ../scenario_legacy_lb.rst:141 ../scenario_legacy_ovs.rst:150 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:153 ../scenario_legacy_lb.rst:141 +#: ../scenario_legacy_ovs.rst:150 ../scenario_provider_ovs.rst:154 msgid "" "*North-south* network traffic travels between an instance and external " "network, typically the Internet. *East-west* network traffic travels between " @@ -134,20 +134,20 @@ msgid "" "port." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:296 ../deploy_scenario4b.rst:264 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:260 ../scenario_provider_ovs.rst:274 msgid "" "A router (4) routes the packet from provider network 1 to provider network 2." msgstr "" -#: ../deploy_scenario4a.rst:225 +#: ../scenario_provider_ovs.rst:212 msgid "" "A router (4) routes the packet from provider network 1 to the external " "network." msgstr "" -#: ../deploy_scenario4b.rst:206 +#: ../deploy_scenario4b.rst:202 msgid "" "A router (4) routes the packet from the provider network to the external " "network." @@ -171,50 +171,50 @@ msgid "" "security group for that network." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:379 ../deploy_scenario4b.rst:327 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:323 ../scenario_provider_ovs.rst:344 msgid "A switch (3) forwards the packet from compute node 1 to compute node 2." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:302 ../deploy_scenario4b.rst:268 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:264 ../scenario_provider_ovs.rst:278 msgid "A switch (3) forwards the packet to compute node 2." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:231 ../deploy_scenario4b.rst:210 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:206 ../scenario_provider_ovs.rst:216 msgid "A switch (3) forwards the packet to the external network." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:222 ../deploy_scenario4a.rst:293 -#: ../deploy_scenario4b.rst:262 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:258 ../scenario_provider_ovs.rst:210 +#: ../scenario_provider_ovs.rst:272 msgid "" "A switch (3) handles any VLAN tag operations between provider network 1 and " "the router (4)." msgstr "" -#: ../deploy_scenario4b.rst:204 +#: ../deploy_scenario4b.rst:200 msgid "" "A switch (3) handles any VLAN tag operations between the provider network " "and the router (4)." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:299 ../deploy_scenario4b.rst:266 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:262 ../scenario_provider_ovs.rst:276 msgid "" "A switch (3) handles any VLAN tag operations between the router (4) and " "provider network 2." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:228 ../deploy_scenario4b.rst:208 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:204 ../scenario_provider_ovs.rst:214 msgid "" "A switch (3) handles any VLAN tag operations between the router (4) and the " "external network." @@ -266,18 +266,18 @@ msgstr "" msgid "Add a tenant subnet interface on the router:" msgstr "" -#: ../deploy_scenario4a.rst:480 ../deploy_scenario4a.rst:552 -msgid "" -"Add the external network interface as a port on the Open vSwitch provider " -"bridge ``br-ex``::" -msgstr "" - # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../scenario_legacy_lb.rst:852 ../scenario_legacy_ovs.rst:957 msgid "Add the project subnet as an interface on the router:" msgstr "" +#: ../scenario_provider_ovs.rst:462 ../scenario_provider_ovs.rst:525 +msgid "" +"Add the provider network interface as a port on the Open vSwitch provider " +"bridge ``br-provider``:" +msgstr "" + #: ../misc_add_ha_for_DHCP.rst:3 msgid "Adding high availability for DHCP" msgstr "" @@ -322,15 +322,15 @@ msgstr "" # #-#-#-#-# config_ml2_plug_in.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# config_server.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../config_ml2_plug_in.rst:9 ../config_server.rst:6 -#: ../deploy_scenario3b.rst:92 ../deploy_scenario4a.rst:97 -#: ../deploy_scenario4b.rst:108 ../scenario_dvr_ovs.rst:111 -#: ../scenario_legacy_lb.rst:92 ../scenario_legacy_ovs.rst:99 +#: ../deploy_scenario3b.rst:92 ../deploy_scenario4b.rst:107 +#: ../scenario_dvr_ovs.rst:111 ../scenario_legacy_lb.rst:92 +#: ../scenario_legacy_ovs.rst:99 ../scenario_provider_ovs.rst:103 msgid "Architecture" msgstr "" @@ -399,14 +399,7 @@ msgid "" "project tunnel networks, and project VLAN networks." msgstr "" -#: ../deploy_scenario4a.rst:53 -msgid "" -"At least two compute nodes with two network interfaces: management and " -"external (typically the Internet). The Open vSwitch bridge ``br-ex`` must " -"contain a port on the external network interface." -msgstr "" - -#: ../deploy_scenario4b.rst:70 +#: ../deploy_scenario4b.rst:69 msgid "" "At least two compute nodes with two network interfaces: management and " "provider. The provider interface connects to a generic network that physical " @@ -414,6 +407,15 @@ msgid "" "Internet)." msgstr "" +#: ../scenario_provider_ovs.rst:63 +msgid "" +"At least two compute nodes with two network interfaces: management and " +"provider. The provider interface connects to a generic network that the " +"pysical network infrastructure switches/routes to external networks " +"(typically the Internet). The Open vSwitch bridge ``br-provider`` must " +"contain a port on the provider network interface." +msgstr "" + #: ../deploy_scenario3b.rst:35 msgid "" "At least two network nodes with four network interfaces: management, project " @@ -471,7 +473,7 @@ msgid "" "hosts that handle various network operations in software." msgstr "" -#: ../deploy_scenario4a.rst:18 +#: ../scenario_provider_ovs.rst:20 msgid "" "Before OpenStack Networking introduced Distributed Virtual Routers (DVR), " "all network traffic traversed one or more dedicated network nodes, which " @@ -494,7 +496,9 @@ msgstr "" msgid "Both instances use the same project network." msgstr "" -#: ../deploy_scenario4b.rst:308 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:304 ../scenario_provider_ovs.rst:321 msgid "Both instances use the same provider network." msgstr "" @@ -533,9 +537,9 @@ msgstr "" msgid "Case 1: HA failover operation" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:158 ../deploy_scenario4b.rst:162 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:158 ../scenario_provider_ovs.rst:164 msgid "Case 1: North-south" msgstr "" @@ -549,9 +553,9 @@ msgstr "" msgid "Case 1: North/south for instances with a fixed IP address" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:237 ../deploy_scenario4b.rst:219 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:215 ../scenario_provider_ovs.rst:225 msgid "Case 2: East-west for instances on different networks" msgstr "" @@ -571,9 +575,9 @@ msgstr "" msgid "Case 3: East-west for instances on different networks" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:331 ../deploy_scenario4b.rst:289 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:285 ../scenario_provider_ovs.rst:302 msgid "Case 3: East-west for instances on the same network" msgstr "" @@ -611,46 +615,46 @@ msgstr "" msgid "Compute node" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:182 ../deploy_scenario4a.rst:259 -#: ../deploy_scenario4a.rst:345 ../deploy_scenario4b.rst:181 -#: ../deploy_scenario4b.rst:234 ../deploy_scenario4b.rst:298 -#: ../scenario_dvr_ovs.rst:201 ../scenario_dvr_ovs.rst:380 -#: ../scenario_legacy_lb.rst:163 ../scenario_legacy_lb.rst:260 -#: ../scenario_legacy_lb.rst:351 ../scenario_legacy_lb.rst:427 -#: ../scenario_legacy_ovs.rst:172 ../scenario_legacy_ovs.rst:265 -#: ../scenario_legacy_ovs.rst:357 ../scenario_legacy_ovs.rst:493 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:177 ../deploy_scenario4b.rst:230 +#: ../deploy_scenario4b.rst:294 ../scenario_dvr_ovs.rst:201 +#: ../scenario_dvr_ovs.rst:380 ../scenario_legacy_lb.rst:163 +#: ../scenario_legacy_lb.rst:260 ../scenario_legacy_lb.rst:351 +#: ../scenario_legacy_lb.rst:427 ../scenario_legacy_ovs.rst:172 +#: ../scenario_legacy_ovs.rst:265 ../scenario_legacy_ovs.rst:357 +#: ../scenario_legacy_ovs.rst:493 ../scenario_provider_ovs.rst:183 +#: ../scenario_provider_ovs.rst:240 ../scenario_provider_ovs.rst:311 msgid "Compute node 1" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:263 ../deploy_scenario4a.rst:349 -#: ../deploy_scenario4b.rst:238 ../deploy_scenario4b.rst:302 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:234 ../deploy_scenario4b.rst:298 #: ../scenario_dvr_ovs.rst:385 ../scenario_legacy_lb.rst:355 #: ../scenario_legacy_lb.rst:431 ../scenario_legacy_ovs.rst:361 -#: ../scenario_legacy_ovs.rst:497 +#: ../scenario_legacy_ovs.rst:497 ../scenario_provider_ovs.rst:244 +#: ../scenario_provider_ovs.rst:315 msgid "Compute node 2" msgstr "" # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3a.rst:100 ../deploy_scenario3b.rst:356 -#: ../deploy_scenario4a.rst:495 ../deploy_scenario4b.rst:446 -#: ../scenario_dvr_ovs.rst:642 ../scenario_legacy_lb.rst:639 -#: ../scenario_legacy_ovs.rst:743 +#: ../deploy_scenario4b.rst:442 ../scenario_dvr_ovs.rst:642 +#: ../scenario_legacy_lb.rst:639 ../scenario_legacy_ovs.rst:743 +#: ../scenario_provider_ovs.rst:479 msgid "Compute nodes" msgstr "" @@ -686,19 +690,14 @@ msgstr "" msgid "Configuration file organization, relationships, etc." msgstr "" -# #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3a.rst:218 ../deploy_scenario3a.rst:294 -#: ../deploy_scenario3a.rst:401 ../deploy_scenario4b.rst:462 +#: ../deploy_scenario3a.rst:401 msgid "" "Configure base options. Edit the :file:`/etc/neutron/neutron.conf` file:" msgstr "" -# #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3b.rst:209 ../deploy_scenario3b.rst:269 -#: ../deploy_scenario3b.rst:368 ../deploy_scenario4a.rst:426 -#: ../deploy_scenario4a.rst:507 +#: ../deploy_scenario3b.rst:368 msgid "" "Configure base options. Edit the :file:`/etc/neutron/neutron.conf` file::" msgstr "" @@ -707,29 +706,27 @@ msgstr "" # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4b.rst:376 ../scenario_dvr_ovs.rst:468 -#: ../scenario_dvr_ovs.rst:548 ../scenario_dvr_ovs.rst:662 -#: ../scenario_legacy_lb.rst:481 ../scenario_legacy_lb.rst:551 -#: ../scenario_legacy_lb.rst:657 ../scenario_legacy_ovs.rst:578 -#: ../scenario_legacy_ovs.rst:651 ../scenario_legacy_ovs.rst:761 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:372 ../deploy_scenario4b.rst:458 +#: ../scenario_dvr_ovs.rst:468 ../scenario_dvr_ovs.rst:548 +#: ../scenario_dvr_ovs.rst:662 ../scenario_legacy_lb.rst:481 +#: ../scenario_legacy_lb.rst:551 ../scenario_legacy_lb.rst:657 +#: ../scenario_legacy_ovs.rst:578 ../scenario_legacy_ovs.rst:651 +#: ../scenario_legacy_ovs.rst:761 ../scenario_provider_ovs.rst:395 +#: ../scenario_provider_ovs.rst:495 msgid "" "Configure common options. Edit the :file:`/etc/neutron/neutron.conf` file:" msgstr "" -#: ../deploy_scenario4a.rst:463 -msgid "" -"Configure the DHCP agent. Edit the :file:`/etc/neutron/dhcp\\_agent.ini` " -"file::" -msgstr "" - # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3a.rst:338 ../deploy_scenario4b.rst:428 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario3a.rst:338 ../deploy_scenario4b.rst:424 #: ../scenario_dvr_ovs.rst:594 ../scenario_legacy_lb.rst:592 -#: ../scenario_legacy_ovs.rst:695 +#: ../scenario_legacy_ovs.rst:695 ../scenario_provider_ovs.rst:441 msgid "" "Configure the DHCP agent. Edit the :file:`/etc/neutron/dhcp_agent.ini` file:" msgstr "" @@ -763,7 +760,7 @@ msgstr "" # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4b.rst:469 ../scenario_legacy_lb.rst:664 +#: ../deploy_scenario4b.rst:465 ../scenario_legacy_lb.rst:664 msgid "" "Configure the Linux bridge agent. Edit the :file:`/etc/neutron/plugins/ml2/" "ml2_conf.ini` file:" @@ -775,20 +772,24 @@ msgid "" "ml2/ml2_conf.ini` file:" msgstr "" -#: ../deploy_scenario4a.rst:437 ../deploy_scenario4a.rst:518 +#: ../deploy_scenario4b.rst:386 msgid "" -"Configure the ML2 plug-in. Edit the :file:`/etc/neutron/plugins/ml2/" -"ml2\\_conf.ini` file::" +"Configure the ML2 plug-in and Linux bridge agent. Edit the :file:`/etc/" +"neutron/plugins/ml2/ml2_conf.ini` file:" +msgstr "" + +#: ../scenario_provider_ovs.rst:409 +msgid "" +"Configure the ML2 plug-in and Open vSwitch agent. Edit the :file:`/etc/" +"neutron/plugins/ml2/ml2_conf.ini` file:" msgstr "" # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3a.rst:248 ../deploy_scenario4b.rst:390 -#: ../scenario_dvr_ovs.rst:485 ../scenario_legacy_lb.rst:491 -#: ../scenario_legacy_ovs.rst:588 +#: ../deploy_scenario3a.rst:248 ../scenario_dvr_ovs.rst:485 +#: ../scenario_legacy_lb.rst:491 ../scenario_legacy_ovs.rst:588 msgid "" "Configure the ML2 plug-in. Edit the :file:`/etc/neutron/plugins/ml2/ml2_conf." "ini` file:" @@ -808,23 +809,25 @@ msgstr "" # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../scenario_dvr_ovs.rst:555 ../scenario_dvr_ovs.rst:669 #: ../scenario_legacy_ovs.rst:658 ../scenario_legacy_ovs.rst:768 +#: ../scenario_provider_ovs.rst:502 msgid "" "Configure the Open vSwitch agent. Edit the :file:`/etc/neutron/plugins/ml2/" "ml2_conf.ini` file:" msgstr "" -#: ../deploy_scenario4b.rst:362 ../deploy_scenario4b.rst:448 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:358 ../deploy_scenario4b.rst:444 +#: ../scenario_provider_ovs.rst:381 ../scenario_provider_ovs.rst:481 msgid "" "Configure the kernel to disable reverse path filtering. Edit the :file:`/etc/" "sysctl.conf` file:" msgstr "" -# #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:358 ../deploy_scenario4a.rst:416 -#: ../deploy_scenario4a.rst:497 +#: ../deploy_scenario3b.rst:358 msgid "" "Configure the kernel to disable reverse path filtering. Edit the :file:`/etc/" "sysctl.conf` file::" @@ -909,15 +912,15 @@ msgstr "" # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3a.rst:74 ../deploy_scenario3b.rst:207 -#: ../deploy_scenario4a.rst:414 ../deploy_scenario4b.rst:360 -#: ../scenario_dvr_ovs.rst:466 ../scenario_legacy_lb.rst:479 -#: ../scenario_legacy_ovs.rst:576 +#: ../deploy_scenario4b.rst:356 ../scenario_dvr_ovs.rst:466 +#: ../scenario_legacy_lb.rst:479 ../scenario_legacy_ovs.rst:576 +#: ../scenario_provider_ovs.rst:379 msgid "Controller node" msgstr "" @@ -955,14 +958,12 @@ msgstr "" msgid "Create a project router:" msgstr "" -#: ../deploy_scenario4b.rst:517 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:513 ../scenario_provider_ovs.rst:564 msgid "Create a provider network:" msgstr "" -#: ../deploy_scenario4a.rst:589 -msgid "Create a provider network::" -msgstr "" - # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# @@ -988,14 +989,12 @@ msgstr "" msgid "Create a subnet on the project network::" msgstr "" -#: ../deploy_scenario4b.rst:544 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:540 ../scenario_provider_ovs.rst:591 msgid "Create a subnet on the provider network:" msgstr "" -#: ../deploy_scenario4a.rst:614 -msgid "Create a subnet on the provider network::" -msgstr "" - #: ../deploy_scenario3a.rst:576 msgid "Create a subnet on the tenant network:" msgstr "" @@ -1006,20 +1005,20 @@ msgstr "" # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3a.rst:459 ../deploy_scenario3b.rst:423 -#: ../deploy_scenario4a.rst:581 ../deploy_scenario4b.rst:511 -#: ../scenario_dvr_ovs.rst:752 ../scenario_legacy_lb.rst:712 -#: ../scenario_legacy_ovs.rst:816 +#: ../deploy_scenario4b.rst:507 ../scenario_dvr_ovs.rst:752 +#: ../scenario_legacy_lb.rst:712 ../scenario_legacy_ovs.rst:816 +#: ../scenario_provider_ovs.rst:558 msgid "Create initial networks" msgstr "" -#: ../deploy_scenario4a.rst:476 ../deploy_scenario4a.rst:548 -msgid "Create the Open vSwitch provider bridge ``br-ex``::" +#: ../scenario_provider_ovs.rst:456 ../scenario_provider_ovs.rst:519 +msgid "Create the Open vSwitch provider bridge ``br-provider``:" msgstr "" #: ../deploy_scenario3b.rst:687 @@ -1028,9 +1027,7 @@ msgid "" "instances." msgstr "" -# #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3a.rst:814 ../deploy_scenario4a.rst:650 +#: ../deploy_scenario3a.rst:814 msgid "" "Create the appropriate security group rules to allow ping and SSH access to " "the instance." @@ -1040,8 +1037,10 @@ msgstr "" # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4b.rst:584 ../scenario_dvr_ovs.rst:1003 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:580 ../scenario_dvr_ovs.rst:1003 #: ../scenario_legacy_lb.rst:945 ../scenario_legacy_ovs.rst:1050 +#: ../scenario_provider_ovs.rst:631 msgid "" "Create the appropriate security group rules to allow ping and SSH access to " "the instance. For example:" @@ -1082,23 +1081,19 @@ msgstr "" # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3a.rst:392 ../deploy_scenario3b.rst:352 -#: ../deploy_scenario4a.rst:492 ../deploy_scenario4b.rst:443 -#: ../scenario_dvr_ovs.rst:638 ../scenario_legacy_lb.rst:635 -#: ../scenario_legacy_ovs.rst:739 +#: ../deploy_scenario4b.rst:439 ../scenario_dvr_ovs.rst:638 +#: ../scenario_legacy_lb.rst:635 ../scenario_legacy_ovs.rst:739 +#: ../scenario_provider_ovs.rst:476 msgid "DHCP agent" msgstr "" -# #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:113 ../deploy_scenario4a.rst:111 -#: ../deploy_scenario4b.rst:122 +#: ../deploy_scenario3b.rst:113 msgid "DHCP agent managing the ``qdhcp`` namespaces." msgstr "" @@ -1116,6 +1111,14 @@ msgid "" "provide DHCP services for instances using project networks." msgstr "" +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:120 ../scenario_provider_ovs.rst:116 +msgid "" +"DHCP agent managing the ``qdhcp`` namespaces. The ``qdhcp`` namespaces " +"provide DHCP services for instances using provider networks." +msgstr "" + #: ../deploy_scenario3a.rst:160 msgid "" "DHCP agent managing the ``qdhcp`` namespaces. The ``qdhcp`` namespaces " @@ -1195,7 +1198,9 @@ msgstr "" msgid "Deployment scenarios" msgstr "" -#: ../deploy_scenario4b.rst:604 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:600 ../scenario_provider_ovs.rst:651 msgid "" "Determine the IP address of the instance. The following step uses " "203.0.113.2." @@ -1237,9 +1242,9 @@ msgstr "" msgid "Does not cover how to do this" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:134 ../scenario_dvr_ovs.rst:168 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../scenario_dvr_ovs.rst:168 ../scenario_provider_ovs.rst:137 msgid "" "Due to limitations with Open vSwitch and *iptables*, the Networking service " "uses a Linux bridge to manage security groups for instances." @@ -1306,14 +1311,14 @@ msgid "" msgstr "" # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:201 ../deploy_scenario4a.rst:408 -#: ../deploy_scenario4b.rst:349 ../scenario_dvr_ovs.rst:457 -#: ../scenario_legacy_lb.rst:473 ../scenario_legacy_ovs.rst:570 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario3b.rst:201 ../deploy_scenario4b.rst:345 +#: ../scenario_dvr_ovs.rst:457 ../scenario_legacy_lb.rst:473 +#: ../scenario_legacy_ovs.rst:570 ../scenario_provider_ovs.rst:368 msgid "Example configuration" msgstr "" @@ -1337,17 +1342,14 @@ msgstr "" # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4b.rst:172 ../scenario_dvr_ovs.rst:188 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:168 ../scenario_dvr_ovs.rst:188 #: ../scenario_dvr_ovs.rst:275 ../scenario_legacy_lb.rst:151 #: ../scenario_legacy_lb.rst:248 ../scenario_legacy_ovs.rst:160 -#: ../scenario_legacy_ovs.rst:253 +#: ../scenario_legacy_ovs.rst:253 ../scenario_provider_ovs.rst:174 msgid "External network" msgstr "" -#: ../deploy_scenario4a.rst:170 -msgid "External network 1" -msgstr "" - #: ../misc_add_ha_for_DHCP.rst:5 msgid "FIXME (Simple note, needs to be added.)" msgstr "" @@ -1433,19 +1435,18 @@ msgstr "" msgid "For VXLAN project networks:" msgstr "" -#: ../deploy_scenario4a.rst:149 -msgid "" -"For all cases, the physical network infrastructure handles routing and " -"switching for *north-south* and *east-west* network traffic." -msgstr "" - -#: ../deploy_scenario4b.rst:134 ../deploy_scenario4b.rst:150 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:130 ../deploy_scenario4b.rst:146 +#: ../scenario_provider_ovs.rst:126 ../scenario_provider_ovs.rst:147 msgid "" "For illustration purposes, the diagram contains two different provider " "networks." msgstr "" -#: ../deploy_scenario4b.rst:59 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:59 ../scenario_provider_ovs.rst:52 msgid "" "For illustration purposes, the management network uses 10.0.0.0/24 and " "provider networks use 192.0.2.0/24, 198.51.100.0/24, and 203.0.113.0/24." @@ -1572,14 +1573,12 @@ msgid "" "delivery packets with public IP addresses." msgstr "" -#: ../deploy_scenario4b.rst:179 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:175 ../scenario_provider_ovs.rst:181 msgid "Gateway 192.0.2.1 with MAC address *TG*" msgstr "" -#: ../deploy_scenario4a.rst:180 -msgid "Gateway 192.0.2.1 with MAC address *TG1*" -msgstr "" - # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# @@ -1606,13 +1605,9 @@ msgstr "" msgid "Gateway 203.0.113.1 with MAC address *EG*" msgstr "" -#: ../deploy_scenario4a.rst:174 -msgid "Gateway 203.0.113.1 with MAC address *EG1*" -msgstr "" - -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:251 ../deploy_scenario4b.rst:227 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:223 ../scenario_provider_ovs.rst:233 msgid "Gateway: 192.0.2.1 with MAC address *TG1*" msgstr "" @@ -1628,9 +1623,9 @@ msgstr "" msgid "Gateway: 192.168.2.1 with MAC address *TG2*" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:257 ../deploy_scenario4b.rst:232 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:228 ../scenario_provider_ovs.rst:238 msgid "Gateway: 198.51.100.1 with MAC address *TG2*" msgstr "" @@ -1795,9 +1790,9 @@ msgid "" "simplest of all scenarios in this guide." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:24 ../deploy_scenario4b.rst:29 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:29 ../scenario_provider_ovs.rst:26 msgid "" "In general, the OpenStack Networking software components that handle layer-3 " "operations impact performance and reliability the most. To improve " @@ -1805,7 +1800,7 @@ msgid "" "the physical network infrastructure." msgstr "" -#: ../deploy_scenario4a.rst:13 +#: ../scenario_provider_ovs.rst:15 msgid "" "In many cases, operators who are already familiar with network architectures " "that rely on the physical network infrastructure can easily deploy OpenStack " @@ -1824,9 +1819,9 @@ msgid "" "deployment to enable more cloud networking features." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:29 ../deploy_scenario4b.rst:34 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:34 ../scenario_provider_ovs.rst:31 msgid "" "In one particular use case, the OpenStack deployment resides in a mixed " "environment with conventional virtualization and bare-metal hosts that use a " @@ -1894,20 +1889,20 @@ msgid "" msgstr "" # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:31 ../deploy_scenario4a.rst:47 -#: ../deploy_scenario4b.rst:64 ../scenario_dvr_ovs.rst:41 -#: ../scenario_legacy_lb.rst:31 ../scenario_legacy_ovs.rst:31 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario3b.rst:31 ../deploy_scenario4b.rst:63 +#: ../scenario_dvr_ovs.rst:41 ../scenario_legacy_lb.rst:31 +#: ../scenario_legacy_ovs.rst:31 ../scenario_provider_ovs.rst:56 msgid "Infrastructure" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:184 ../deploy_scenario4b.rst:183 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:179 ../scenario_provider_ovs.rst:185 msgid "Instance 1 192.0.2.11 with MAC address *I1*" msgstr "" @@ -1942,7 +1937,9 @@ msgstr "" msgid "Instance 1 resides on compute node 1 and uses a project network." msgstr "" -#: ../deploy_scenario4b.rst:185 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:181 ../scenario_provider_ovs.rst:187 msgid "Instance 1 resides on compute node 1 and uses a provider network." msgstr "" @@ -1952,29 +1949,18 @@ msgstr "" msgid "Instance 1 resides on compute node 1 and uses project network 1." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:160 ../deploy_scenario4b.rst:242 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:238 ../scenario_provider_ovs.rst:248 msgid "Instance 1 resides on compute node 1 and uses provider network 1." msgstr "" -#: ../deploy_scenario4a.rst:333 -msgid "" -"Instance 1 resides on compute node 1 and uses provider network 1. Instance 2 " -"resides on compute node 2 and uses provider network 1." -msgstr "" - -#: ../deploy_scenario4a.rst:239 -msgid "" -"Instance 1 resides on compute node 1 and uses provider network 1. Instance 2 " -"resides on compute node 2 and uses provider network 2." -msgstr "" - # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4b.rst:306 ../scenario_legacy_lb.rst:435 -#: ../scenario_legacy_ovs.rst:501 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:302 ../scenario_legacy_lb.rst:435 +#: ../scenario_legacy_ovs.rst:501 ../scenario_provider_ovs.rst:319 msgid "Instance 1 resides on compute node 1." msgstr "" @@ -1982,23 +1968,23 @@ msgstr "" msgid "Instance 1 sends a packet to a host on the external network." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:242 ../deploy_scenario4a.rst:336 -#: ../deploy_scenario4b.rst:244 ../deploy_scenario4b.rst:309 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:240 ../deploy_scenario4b.rst:305 #: ../scenario_dvr_ovs.rst:393 ../scenario_legacy_lb.rst:362 #: ../scenario_legacy_lb.rst:438 ../scenario_legacy_ovs.rst:368 -#: ../scenario_legacy_ovs.rst:504 +#: ../scenario_legacy_ovs.rst:504 ../scenario_provider_ovs.rst:250 +#: ../scenario_provider_ovs.rst:322 msgid "Instance 1 sends a packet to instance 2." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:261 ../deploy_scenario4a.rst:347 -#: ../deploy_scenario4b.rst:236 ../deploy_scenario4b.rst:300 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:232 ../deploy_scenario4b.rst:296 +#: ../scenario_provider_ovs.rst:242 ../scenario_provider_ovs.rst:313 msgid "Instance 1: 192.0.2.11 with MAC address *I1*" msgstr "" @@ -2023,21 +2009,24 @@ msgstr "" msgid "Instance 2 resides on compute node 2 and uses project network 2." msgstr "" -#: ../deploy_scenario4b.rst:243 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:239 ../scenario_provider_ovs.rst:249 msgid "Instance 2 resides on compute node 2 and uses provider network 2." msgstr "" # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4b.rst:307 ../scenario_legacy_lb.rst:436 -#: ../scenario_legacy_ovs.rst:502 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:303 ../scenario_legacy_lb.rst:436 +#: ../scenario_legacy_ovs.rst:502 ../scenario_provider_ovs.rst:320 msgid "Instance 2 resides on compute node 2." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:351 ../deploy_scenario4b.rst:304 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:300 ../scenario_provider_ovs.rst:317 msgid "Instance 2: 192.0.2.12 with MAC address *I2*" msgstr "" @@ -2053,9 +2042,9 @@ msgstr "" msgid "Instance 2: 192.168.2.11 with MAC address *I2*" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:265 ../deploy_scenario4b.rst:240 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:236 ../scenario_provider_ovs.rst:246 msgid "Instance 2: 198.51.100.11 with MAC address *I2*" msgstr "" @@ -2183,9 +2172,9 @@ msgstr "" msgid "Launch an instance with an interface on the project network." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:653 ../deploy_scenario4b.rst:603 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:599 ../scenario_provider_ovs.rst:650 msgid "Launch an instance with an interface on the provider network." msgstr "" @@ -2263,7 +2252,7 @@ msgstr "" # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3b.rst:350 ../deploy_scenario3b.rst:397 -#: ../deploy_scenario4b.rst:442 ../deploy_scenario4b.rst:490 +#: ../deploy_scenario4b.rst:438 ../deploy_scenario4b.rst:486 #: ../scenario_legacy_lb.rst:633 ../scenario_legacy_lb.rst:689 msgid "Linux bridge agent" msgstr "" @@ -2271,7 +2260,7 @@ msgstr "" # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:109 ../deploy_scenario4b.rst:118 +#: ../deploy_scenario3b.rst:109 ../deploy_scenario4b.rst:117 #: ../scenario_legacy_lb.rst:108 msgid "" "Linux bridge agent managing virtual switches, connectivity among them, and " @@ -2282,7 +2271,7 @@ msgstr "" # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:137 ../deploy_scenario4b.rst:139 +#: ../deploy_scenario3b.rst:137 ../deploy_scenario4b.rst:135 #: ../scenario_legacy_lb.rst:127 msgid "" "Linux bridge agent managing virtual switches, connectivity among them, and " @@ -2290,9 +2279,9 @@ msgid "" "namespaces, security groups, and underlying interfaces." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:131 ../scenario_dvr_ovs.rst:165 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../scenario_dvr_ovs.rst:165 ../scenario_provider_ovs.rst:134 msgid "Linux bridges handling security groups." msgstr "" @@ -2333,17 +2322,16 @@ msgstr "" # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4b.rst:370 ../deploy_scenario4b.rst:456 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:366 ../deploy_scenario4b.rst:452 #: ../scenario_dvr_ovs.rst:542 ../scenario_dvr_ovs.rst:656 #: ../scenario_legacy_lb.rst:545 ../scenario_legacy_lb.rst:651 #: ../scenario_legacy_ovs.rst:645 ../scenario_legacy_ovs.rst:755 +#: ../scenario_provider_ovs.rst:389 ../scenario_provider_ovs.rst:489 msgid "Load the new kernel configuration:" msgstr "" -# #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3b.rst:265 ../deploy_scenario3b.rst:364 -#: ../deploy_scenario4a.rst:422 ../deploy_scenario4a.rst:503 msgid "Load the new kernel configuration::" msgstr "" @@ -2370,7 +2358,7 @@ msgstr "" # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:89 ../deploy_scenario4b.rst:105 +#: ../deploy_scenario3b.rst:89 ../deploy_scenario4b.rst:104 #: ../scenario_legacy_lb.rst:89 msgid "ML2 plug-in, Linux bridge agent, and any dependencies." msgstr "" @@ -2493,9 +2481,9 @@ msgid "" "NAT functionality." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:178 ../deploy_scenario4b.rst:178 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:174 ../scenario_provider_ovs.rst:180 msgid "Network 192.0.2.0/24" msgstr "" @@ -2513,15 +2501,15 @@ msgstr "" msgid "Network 192.168.2.0/24" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:172 ../deploy_scenario4b.rst:174 -#: ../scenario_dvr_ovs.rst:190 ../scenario_dvr_ovs.rst:277 -#: ../scenario_legacy_lb.rst:153 ../scenario_legacy_lb.rst:250 -#: ../scenario_legacy_ovs.rst:162 ../scenario_legacy_ovs.rst:255 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:170 ../scenario_dvr_ovs.rst:190 +#: ../scenario_dvr_ovs.rst:277 ../scenario_legacy_lb.rst:153 +#: ../scenario_legacy_lb.rst:250 ../scenario_legacy_ovs.rst:162 +#: ../scenario_legacy_ovs.rst:255 ../scenario_provider_ovs.rst:176 msgid "Network 203.0.113.0/24" msgstr "" @@ -2575,10 +2563,10 @@ msgstr "" msgid "Network type drivers" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:249 ../deploy_scenario4a.rst:343 -#: ../deploy_scenario4b.rst:226 ../deploy_scenario4b.rst:296 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:222 ../deploy_scenario4b.rst:292 +#: ../scenario_provider_ovs.rst:232 ../scenario_provider_ovs.rst:309 msgid "Network: 192.0.2.0/24" msgstr "" @@ -2595,9 +2583,9 @@ msgstr "" msgid "Network: 192.168.2.0/24" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:255 ../deploy_scenario4b.rst:231 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:227 ../scenario_provider_ovs.rst:237 msgid "Network: 198.51.100.0/24" msgstr "" @@ -2610,7 +2598,7 @@ msgid "" "load balancers, and other networking infrastructure on the same layer 2 VLAN." msgstr "" -#: ../deploy_scenario4b.rst:95 +#: ../deploy_scenario4b.rst:94 msgid "" "Neutron server service, ML2 plug-in, Linux bridge agent, DHCP agent, and any " "dependencies." @@ -2627,7 +2615,7 @@ msgstr "" msgid "Neutron server service, ML2 plug-in, and any dependencies." msgstr "" -#: ../deploy_scenario4a.rst:81 +#: ../scenario_provider_ovs.rst:89 msgid "" "Neutron server service, Open vSwitch service, ML2 plug-in, Open vSwitch " "agent, DHCP agent, and any dependencies." @@ -2674,9 +2662,9 @@ msgstr "" msgid "OVS" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:668 ../deploy_scenario4b.rst:622 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:618 ../scenario_provider_ovs.rst:669 msgid "Obtain access to the instance." msgstr "" @@ -2777,7 +2765,9 @@ msgid "" "the floating IP address associated with the instance:" msgstr "" -#: ../deploy_scenario4b.rst:606 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:602 ../scenario_provider_ovs.rst:653 msgid "" "On the controller node or any host with access to the provider network, ping " "the IP address of the instance:" @@ -2806,14 +2796,12 @@ msgid "" "router`` router:" msgstr "" -#: ../deploy_scenario4b.rst:572 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:568 ../scenario_provider_ovs.rst:619 msgid "On the controller node, verify creation of the ``qdhcp`` namespace:" msgstr "" -#: ../deploy_scenario4a.rst:639 -msgid "On the controller node, verify creation of the ``qdhcp`` namespace::" -msgstr "" - # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../scenario_legacy_lb.rst:869 ../scenario_legacy_ovs.rst:974 @@ -2877,20 +2865,22 @@ msgstr "" msgid "One controller node with one network interface: management." msgstr "" -#: ../deploy_scenario4a.rst:49 -msgid "" -"One controller node with two network interfaces: management and external " -"(typically the Internet). The Open vSwitch bridge ``br-ex`` must contain an " -"port on the external network interface." -msgstr "" - -#: ../deploy_scenario4b.rst:66 +#: ../deploy_scenario4b.rst:65 msgid "" "One controller node with two network interfaces: management and provider. " "The provider interface connects to a generic network that physical network " "infrastructure switches/routes to external networks (typically the Internet)." msgstr "" +#: ../scenario_provider_ovs.rst:58 +msgid "" +"One controller node with two network interfaces: management and provider. " +"The provider interface connects to a generic network that physical network " +"infrastructure switches/routes to external networks (typically the " +"Internet). The Open vSwitch bridge ``br-provider`` must contain an port on " +"the provider network interface." +msgstr "" + #: ../scenario_legacy_lb.rst:34 msgid "" "One network node with four network interfaces: management, project tunnel " @@ -2935,14 +2925,14 @@ msgstr "" # #-#-#-#-# config_ml2_plug_in.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../config_ml2_plug_in.rst:54 ../deploy_scenario3a.rst:389 -#: ../deploy_scenario3a.rst:430 ../deploy_scenario4a.rst:474 -#: ../deploy_scenario4a.rst:546 ../scenario_dvr_ovs.rst:635 +#: ../deploy_scenario3a.rst:430 ../scenario_dvr_ovs.rst:635 #: ../scenario_dvr_ovs.rst:722 ../scenario_legacy_ovs.rst:736 -#: ../scenario_legacy_ovs.rst:792 +#: ../scenario_legacy_ovs.rst:792 ../scenario_provider_ovs.rst:454 +#: ../scenario_provider_ovs.rst:517 msgid "Open vSwitch" msgstr "" @@ -2951,24 +2941,24 @@ msgid "Open vSwitch Layer 3 architecture for high availability" msgstr "" # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3a.rst:390 ../deploy_scenario3a.rst:431 -#: ../deploy_scenario4a.rst:491 ../deploy_scenario4a.rst:562 #: ../scenario_dvr_ovs.rst:636 ../scenario_dvr_ovs.rst:723 #: ../scenario_legacy_ovs.rst:737 ../scenario_legacy_ovs.rst:793 +#: ../scenario_provider_ovs.rst:475 ../scenario_provider_ovs.rst:537 msgid "Open vSwitch agent" msgstr "" -#: ../deploy_scenario4a.rst:127 +#: ../scenario_provider_ovs.rst:131 msgid "" "Open vSwitch agent managing virtual switches, connectivity among them, and " "interaction via virtual ports with other network components such as Linux " "bridges and underlying interfaces." msgstr "" -#: ../deploy_scenario4a.rst:107 +#: ../scenario_provider_ovs.rst:113 msgid "" "Open vSwitch agent managing virtual switches, connectivity among them, and " "interaction via virtual ports with other network components such as " @@ -3014,13 +3004,20 @@ msgid "" "including the ``ipset`` utility." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:93 ../scenario_legacy_ovs.rst:95 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../scenario_legacy_ovs.rst:95 ../scenario_provider_ovs.rst:99 msgid "" "Open vSwitch service, ML2 plug-in, Open vSwitch agent, and any dependencies." msgstr "" +#: ../scenario_provider_ovs.rst:159 +msgid "" +"Open vSwitch uses VLANs internally to segregate networks that traverse " +"bridges. The VLAN ID usually differs from the segmentation ID of the virtual " +"network." +msgstr "" + #: ../intro_networking.rst:30 msgid "" "OpenStack Compute (nova) is used to plug each virtual NIC on the VM into a " @@ -3082,26 +3079,26 @@ msgid "OpenStack networking plug-in and agents" msgstr "" # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:81 ../deploy_scenario4a.rst:85 -#: ../deploy_scenario4b.rst:99 ../scenario_dvr_ovs.rst:101 -#: ../scenario_legacy_lb.rst:83 ../scenario_legacy_ovs.rst:89 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario3b.rst:81 ../deploy_scenario4b.rst:98 +#: ../scenario_dvr_ovs.rst:101 ../scenario_legacy_lb.rst:83 +#: ../scenario_legacy_ovs.rst:89 ../scenario_provider_ovs.rst:93 msgid "OpenStack services - compute nodes" msgstr "" # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:55 ../deploy_scenario4a.rst:67 -#: ../deploy_scenario4b.rst:85 ../scenario_dvr_ovs.rst:80 -#: ../scenario_legacy_lb.rst:62 ../scenario_legacy_ovs.rst:67 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario3b.rst:55 ../deploy_scenario4b.rst:84 +#: ../scenario_dvr_ovs.rst:80 ../scenario_legacy_lb.rst:62 +#: ../scenario_legacy_ovs.rst:67 ../scenario_provider_ovs.rst:79 msgid "OpenStack services - controller node" msgstr "" @@ -3155,16 +3152,16 @@ msgid "" msgstr "" # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:66 ../deploy_scenario4a.rst:78 -#: ../deploy_scenario4a.rst:90 ../deploy_scenario4b.rst:93 -#: ../deploy_scenario4b.rst:103 ../scenario_dvr_ovs.rst:88 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario3b.rst:66 ../deploy_scenario4b.rst:92 +#: ../deploy_scenario4b.rst:102 ../scenario_dvr_ovs.rst:88 #: ../scenario_legacy_lb.rst:70 ../scenario_legacy_lb.rst:87 #: ../scenario_legacy_ovs.rst:75 ../scenario_legacy_ovs.rst:93 +#: ../scenario_provider_ovs.rst:87 ../scenario_provider_ovs.rst:97 msgid "" "Operational OpenStack Compute controller/management service with appropriate " "configuration to use neutron in the :file:`nova.conf` file." @@ -3178,11 +3175,8 @@ msgid "" "configuration to use neutron in the :file:`nova.conf` file." msgstr "" -# #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3b.rst:63 ../deploy_scenario3b.rst:74 -#: ../deploy_scenario3b.rst:83 ../deploy_scenario4a.rst:75 -#: ../deploy_scenario4a.rst:87 +#: ../deploy_scenario3b.rst:83 msgid "" "Operational OpenStack Identity service with appropriate configuration in " "the :file:`neutron-server.conf` file." @@ -3193,21 +3187,21 @@ msgstr "" # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3a.rst:82 ../deploy_scenario3a.rst:93 -#: ../deploy_scenario3a.rst:102 ../deploy_scenario4b.rst:91 -#: ../deploy_scenario4b.rst:101 ../scenario_dvr_ovs.rst:86 +#: ../deploy_scenario3a.rst:102 ../deploy_scenario4b.rst:90 +#: ../deploy_scenario4b.rst:100 ../scenario_dvr_ovs.rst:86 #: ../scenario_dvr_ovs.rst:95 ../scenario_dvr_ovs.rst:103 #: ../scenario_legacy_lb.rst:68 ../scenario_legacy_lb.rst:77 #: ../scenario_legacy_lb.rst:85 ../scenario_legacy_ovs.rst:73 #: ../scenario_legacy_ovs.rst:83 ../scenario_legacy_ovs.rst:91 +#: ../scenario_provider_ovs.rst:85 ../scenario_provider_ovs.rst:95 msgid "" "Operational OpenStack Identity service with appropriate configuration in " "the :file:`neutron.conf` file." msgstr "" -# #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:57 ../deploy_scenario4a.rst:69 +#: ../deploy_scenario3b.rst:57 msgid "" "Operational SQL server with ``neutron`` database and appropriate " "configuration in the :file:`neutron-server.conf` file." @@ -3218,17 +3212,16 @@ msgstr "" # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3a.rst:76 ../deploy_scenario4b.rst:87 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario3a.rst:76 ../deploy_scenario4b.rst:86 #: ../scenario_dvr_ovs.rst:82 ../scenario_legacy_lb.rst:64 -#: ../scenario_legacy_ovs.rst:69 +#: ../scenario_legacy_ovs.rst:69 ../scenario_provider_ovs.rst:81 msgid "" "Operational SQL server with ``neutron`` database and appropriate " "configuration in the :file:`neutron.conf` file." msgstr "" -# #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:60 ../deploy_scenario4a.rst:72 +#: ../deploy_scenario3b.rst:60 msgid "" "Operational message queue service with appropriate configuration in the :" "file:`neutron-server.conf` file." @@ -3239,9 +3232,10 @@ msgstr "" # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3a.rst:79 ../deploy_scenario4b.rst:89 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario3a.rst:79 ../deploy_scenario4b.rst:88 #: ../scenario_dvr_ovs.rst:84 ../scenario_legacy_lb.rst:66 -#: ../scenario_legacy_ovs.rst:71 +#: ../scenario_legacy_ovs.rst:71 ../scenario_provider_ovs.rst:83 msgid "" "Operational message queue service with appropriate configuration in the :" "file:`neutron.conf` file." @@ -3276,15 +3270,15 @@ msgstr "" # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3a.rst:191 ../deploy_scenario3b.rst:148 -#: ../deploy_scenario4a.rst:147 ../deploy_scenario4b.rst:154 -#: ../scenario_dvr_ovs.rst:179 ../scenario_legacy_lb.rst:138 -#: ../scenario_legacy_ovs.rst:147 +#: ../deploy_scenario4b.rst:150 ../scenario_dvr_ovs.rst:179 +#: ../scenario_legacy_lb.rst:138 ../scenario_legacy_ovs.rst:147 +#: ../scenario_provider_ovs.rst:151 msgid "Packet flow" msgstr "" @@ -3320,14 +3314,14 @@ msgid "Prefix delegation" msgstr "" # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:20 ../deploy_scenario4a.rst:36 -#: ../deploy_scenario4b.rst:48 ../scenario_dvr_ovs.rst:28 -#: ../scenario_legacy_lb.rst:18 ../scenario_legacy_ovs.rst:18 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario3b.rst:20 ../deploy_scenario4b.rst:48 +#: ../scenario_dvr_ovs.rst:28 ../scenario_legacy_lb.rst:18 +#: ../scenario_legacy_ovs.rst:18 ../scenario_provider_ovs.rst:41 msgid "Prerequisites" msgstr "" @@ -3404,24 +3398,27 @@ msgstr "" msgid "Proprietary (vendor)" msgstr "" -#: ../deploy_scenario4b.rst:294 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:290 ../scenario_provider_ovs.rst:307 msgid "Provider network" msgstr "" -#: ../deploy_scenario4b.rst:176 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:172 ../scenario_provider_ovs.rst:178 msgid "Provider network (VLAN)" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:176 ../deploy_scenario4a.rst:247 -#: ../deploy_scenario4a.rst:341 ../deploy_scenario4b.rst:224 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:220 ../scenario_provider_ovs.rst:230 msgid "Provider network 1" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:253 ../deploy_scenario4b.rst:229 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:225 ../scenario_provider_ovs.rst:235 msgid "Provider network 2" msgstr "" @@ -3429,15 +3426,9 @@ msgstr "" msgid "Provider networks" msgstr "" -#: ../deploy_scenario4a.rst:8 -msgid "" -"Provider networks generally offer simplicity, performance, and reliability " -"at the cost of flexibility. Unlike other scenarios, only administrators can " -"manage provider networks because they require configuration of physical " -"network infrastructure." -msgstr "" - -#: ../deploy_scenario4b.rst:8 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:8 ../scenario_provider_ovs.rst:8 msgid "" "Provider networks generally offer simplicity, performance, and reliability " "at the cost of flexibility. Unlike other scenarios, only administrators can " @@ -3475,12 +3466,6 @@ msgid "" "environment." msgstr "" -#: ../deploy_scenario4a.rst:485 ../deploy_scenario4a.rst:557 -msgid "" -"Replace ``EXTERNAL_NETWORK_INTERFACE`` with the respective underlying " -"network interface name. For example, ``eth1``." -msgstr "" - # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# @@ -3551,10 +3536,13 @@ msgid "" "that handles VXLAN project networks." msgstr "" -#: ../deploy_scenario4b.rst:417 ../deploy_scenario4b.rst:485 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:413 ../deploy_scenario4b.rst:481 +#: ../scenario_provider_ovs.rst:469 ../scenario_provider_ovs.rst:532 msgid "" "Replace ``PROVIDER_INTERFACE`` with the name of the underlying interface " -"that handles provider networks. For example, ``eth1``.`" +"that handles provider networks. For example, ``eth1``." msgstr "" #: ../deploy_scenario3a.rst:319 @@ -3588,18 +3576,19 @@ msgid "" "that handles GRE/VXLAN project networks." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:325 ../deploy_scenario4a.rst:402 -#: ../deploy_scenario4b.rst:213 ../deploy_scenario4b.rst:283 -#: ../deploy_scenario4b.rst:343 ../scenario_dvr_ovs.rst:260 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:209 ../deploy_scenario4b.rst:279 +#: ../deploy_scenario4b.rst:339 ../scenario_dvr_ovs.rst:260 #: ../scenario_legacy_lb.rst:237 ../scenario_legacy_lb.rst:329 #: ../scenario_legacy_lb.rst:411 ../scenario_legacy_lb.rst:467 #: ../scenario_legacy_ovs.rst:242 ../scenario_legacy_ovs.rst:335 #: ../scenario_legacy_ovs.rst:477 ../scenario_legacy_ovs.rst:564 +#: ../scenario_provider_ovs.rst:219 ../scenario_provider_ovs.rst:296 +#: ../scenario_provider_ovs.rst:362 msgid "Return traffic follows similar steps in reverse." msgstr "" @@ -3647,10 +3636,6 @@ msgstr "" msgid "Scenario 3b: High Availability using L3HA with Linux bridge" msgstr "" -#: ../deploy_scenario4a.rst:3 -msgid "Scenario 4a: Provider networks with Open vSwitch" -msgstr "" - #: ../scenario_dvr_ovs.rst:3 msgid "Scenario: High Availability using Distributed Virtual Routing (DVR)" msgstr "" @@ -3667,6 +3652,10 @@ msgstr "" msgid "Scenario: Provider networks with Linux bridge" msgstr "" +#: ../scenario_provider_ovs.rst:3 +msgid "Scenario: Provider networks with Open vSwitch" +msgstr "" + #: ../index.rst:37 msgid "Search in this guide" msgstr "" @@ -3681,22 +3670,34 @@ msgid "" "state tracking for the packet." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# +#: ../scenario_provider_ovs.rst:195 ../scenario_provider_ovs.rst:257 +#: ../scenario_provider_ovs.rst:329 +msgid "" +"Security group rules (2) on the Linux bridge ``qbr`` handle firewalling and " +"state tracking for the packet." +msgstr "" + # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:273 ../scenario_dvr_ovs.rst:218 -#: ../scenario_dvr_ovs.rst:404 ../scenario_legacy_ovs.rst:184 -#: ../scenario_legacy_ovs.rst:375 +#: ../scenario_dvr_ovs.rst:218 ../scenario_dvr_ovs.rst:404 +#: ../scenario_legacy_ovs.rst:184 ../scenario_legacy_ovs.rst:375 msgid "" "Security group rules (2) on the Linux bridge ``qbr`` handle state tracking " "for the packet." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:202 ../deploy_scenario4a.rst:359 -#: ../deploy_scenario4b.rst:193 ../deploy_scenario4b.rst:316 +#: ../deploy_scenario4b.rst:312 +msgid "" +"Security group rules (2) on the provider bridge ``qbr`` handle firewalling " +"and state tracking for the packet." +msgstr "" + +#: ../deploy_scenario4b.rst:189 +msgid "" +"Security group rules (2) on the provider bridge ``qbr`` handle firewalling " +"and tracking for the packet." +msgstr "" + #: ../scenario_legacy_ovs.rst:512 msgid "" "Security group rules (2) on the provider bridge ``qbr`` handle state " @@ -3716,29 +3717,29 @@ msgid "" "state tracking for the packet." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:395 ../scenario_legacy_ovs.rst:329 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../scenario_legacy_ovs.rst:329 ../scenario_provider_ovs.rst:356 msgid "" "Security group rules (4) on the Linux bridge ``qbr`` handle firewalling and " "state tracking for the packet." msgstr "" -#: ../deploy_scenario4b.rst:337 +#: ../deploy_scenario4b.rst:333 msgid "" "Security group rules (4) on the provider bridge ``qbr`` handle firewalling " "and state tracking for the packet." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:318 ../scenario_legacy_ovs.rst:471 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../scenario_legacy_ovs.rst:471 ../scenario_provider_ovs.rst:290 msgid "" "Security group rules (5) on the Linux bridge ``qbr`` handle firewalling and " "state tracking for the packet." msgstr "" -#: ../deploy_scenario4b.rst:278 +#: ../deploy_scenario4b.rst:274 msgid "" "Security group rules (5) on the provider bridge ``qbr`` handle firewalling " "and state tracking for the packet." @@ -3786,10 +3787,10 @@ msgid "" "the packet." msgstr "" -#: ../deploy_scenario4b.rst:251 +#: ../deploy_scenario4b.rst:247 msgid "" -"Security group rules on the provider bridge ``qbr`` handle state tracking " -"for the packet." +"Security group rules on the provider bridge ``qbr`` handle firewalling and " +"state tracking for the packet." msgstr "" #: ../intro_os_networking_overview.rst:130 @@ -3816,16 +3817,16 @@ msgstr "" # #-#-#-#-# config_server.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# intro_os_networking_service.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../config_server.rst:3 ../deploy_scenario3b.rst:253 -#: ../deploy_scenario4a.rst:490 ../deploy_scenario4b.rst:441 -#: ../intro_os_networking_service.rst:6 ../scenario_dvr_ovs.rst:528 -#: ../scenario_legacy_lb.rst:531 ../scenario_legacy_ovs.rst:631 +#: ../deploy_scenario4b.rst:437 ../intro_os_networking_service.rst:6 +#: ../scenario_dvr_ovs.rst:528 ../scenario_legacy_lb.rst:531 +#: ../scenario_legacy_ovs.rst:631 ../scenario_provider_ovs.rst:474 msgid "Server" msgstr "" @@ -3869,18 +3870,18 @@ msgid "Source the ``demo`` tenant credentials." msgstr "" # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3b.rst:402 ../deploy_scenario3b.rst:427 -#: ../deploy_scenario3b.rst:556 ../deploy_scenario4a.rst:567 -#: ../deploy_scenario4a.rst:587 ../deploy_scenario4b.rst:495 -#: ../deploy_scenario4b.rst:516 ../scenario_dvr_ovs.rst:730 +#: ../deploy_scenario3b.rst:556 ../deploy_scenario4b.rst:491 +#: ../deploy_scenario4b.rst:512 ../scenario_dvr_ovs.rst:730 #: ../scenario_dvr_ovs.rst:756 ../scenario_dvr_ovs.rst:930 #: ../scenario_legacy_lb.rst:694 ../scenario_legacy_lb.rst:716 #: ../scenario_legacy_ovs.rst:798 ../scenario_legacy_ovs.rst:820 +#: ../scenario_provider_ovs.rst:542 ../scenario_provider_ovs.rst:563 msgid "Source the administrative project credentials." msgstr "" @@ -3888,10 +3889,7 @@ msgstr "" msgid "Source the administrative tenant credentials." msgstr "" -# #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3b.rst:474 ../deploy_scenario3b.rst:684 -#: ../deploy_scenario4a.rst:647 msgid "" "Source the credentials for a non-privileged project. The following steps use " "the ``demo`` project." @@ -3906,7 +3904,9 @@ msgstr "" msgid "Source the regular project credentials." msgstr "" -#: ../deploy_scenario4b.rst:582 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:578 ../scenario_provider_ovs.rst:629 msgid "" "Source the regular project credentials. The following steps use the ``demo`` " "project." @@ -3926,26 +3926,26 @@ msgid "" "restricted to read-write only by nova-api." msgstr "" -#: ../deploy_scenario4a.rst:472 ../deploy_scenario4a.rst:544 +#: ../scenario_provider_ovs.rst:452 ../scenario_provider_ovs.rst:515 msgid "Start the following service:" msgstr "" # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3a.rst:387 ../deploy_scenario3a.rst:428 #: ../deploy_scenario3b.rst:251 ../deploy_scenario3b.rst:348 -#: ../deploy_scenario3b.rst:395 ../deploy_scenario4a.rst:488 -#: ../deploy_scenario4a.rst:560 ../deploy_scenario4b.rst:439 -#: ../deploy_scenario4b.rst:488 ../scenario_dvr_ovs.rst:526 +#: ../deploy_scenario3b.rst:395 ../deploy_scenario4b.rst:435 +#: ../deploy_scenario4b.rst:484 ../scenario_dvr_ovs.rst:526 #: ../scenario_dvr_ovs.rst:633 ../scenario_dvr_ovs.rst:720 #: ../scenario_legacy_lb.rst:529 ../scenario_legacy_lb.rst:631 #: ../scenario_legacy_lb.rst:687 ../scenario_legacy_ovs.rst:629 #: ../scenario_legacy_ovs.rst:734 ../scenario_legacy_ovs.rst:790 +#: ../scenario_provider_ovs.rst:472 ../scenario_provider_ovs.rst:535 msgid "Start the following services:" msgstr "" @@ -4003,18 +4003,15 @@ msgid "" "Test connectivity to external network gateway IP address on the router::" msgstr "" -#: ../deploy_scenario4a.rst:670 -msgid "Test connectivity to the Internet from the instance::" -msgstr "" - # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3a.rst:799 ../deploy_scenario4b.rst:623 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario3a.rst:799 ../deploy_scenario4b.rst:619 #: ../scenario_dvr_ovs.rst:988 ../scenario_legacy_lb.rst:930 -#: ../scenario_legacy_ovs.rst:1035 +#: ../scenario_legacy_ovs.rst:1035 ../scenario_provider_ovs.rst:670 msgid "Test connectivity to the Internet:" msgstr "" @@ -4026,10 +4023,6 @@ msgstr "" msgid "Test connectivity to the floating IP address on the instance::" msgstr "" -#: ../deploy_scenario4a.rst:655 -msgid "Test connectivity to the instance::" -msgstr "" - #: ../deploy_scenario3b.rst:692 msgid "" "Test connectivity to the internal network gateway IP address on the router::" @@ -4183,14 +4176,14 @@ msgid "" "rely on network nodes for routing and DNAT/SNAT services." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:205 ../deploy_scenario4a.rst:276 -#: ../deploy_scenario4a.rst:362 ../scenario_dvr_ovs.rst:220 -#: ../scenario_dvr_ovs.rst:339 ../scenario_dvr_ovs.rst:406 -#: ../scenario_legacy_ovs.rst:186 ../scenario_legacy_ovs.rst:377 -#: ../scenario_legacy_ovs.rst:514 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../scenario_dvr_ovs.rst:220 ../scenario_dvr_ovs.rst:339 +#: ../scenario_dvr_ovs.rst:406 ../scenario_legacy_ovs.rst:186 +#: ../scenario_legacy_ovs.rst:377 ../scenario_legacy_ovs.rst:514 +#: ../scenario_provider_ovs.rst:197 ../scenario_provider_ovs.rst:259 +#: ../scenario_provider_ovs.rst:331 msgid "" "The Linux bridge ``qbr`` forwards the packet to the Open vSwitch integration " "bridge ``br-int``." @@ -4208,15 +4201,15 @@ msgid "" "instance 1." msgstr "" -#: ../deploy_scenario4a.rst:398 +#: ../scenario_provider_ovs.rst:358 msgid "" "The Linux bridge ``qbr`` forwards the packet to the ``tap`` interface (5) on " "instance 2." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:321 ../scenario_legacy_ovs.rst:473 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../scenario_legacy_ovs.rst:473 ../scenario_provider_ovs.rst:292 msgid "" "The Linux bridge ``qbr`` forwards the packet to the ``tap`` interface (6) on " "instance 2." @@ -4274,10 +4267,10 @@ msgid "" "defined networking (SDN) controllers." msgstr "" -#: ../deploy_scenario4a.rst:288 ../deploy_scenario4a.rst:374 +#: ../scenario_provider_ovs.rst:267 ../scenario_provider_ovs.rst:339 msgid "" -"The Open vSwitch VLAN bridge ``br-ex`` forwards the packet to the physical " -"network infrastructure via the external network interface." +"The Open vSwitch VLAN bridge ``br-provider`` forwards the packet to the " +"physical network infrastructure via the provider network interface." msgstr "" #: ../scenario_legacy_ovs.rst:437 @@ -4368,10 +4361,9 @@ msgid "" "project network 2." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:208 ../deploy_scenario4a.rst:279 -#: ../deploy_scenario4a.rst:365 ../scenario_legacy_ovs.rst:516 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../scenario_legacy_ovs.rst:516 ../scenario_provider_ovs.rst:261 msgid "" "The Open vSwitch integration bridge ``br-int`` adds the internal tag for " "provider network 1." @@ -4383,6 +4375,12 @@ msgid "" "project network." msgstr "" +#: ../scenario_provider_ovs.rst:199 ../scenario_provider_ovs.rst:333 +msgid "" +"The Open vSwitch integration bridge ``br-int`` adds the internal tag for the " +"provider network." +msgstr "" + #: ../scenario_dvr_ovs.rst:224 msgid "" "The Open vSwitch integration bridge ``br-int`` forwards the packet (3) to " @@ -4390,13 +4388,13 @@ msgid "" "router namespace ``qrouter``." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:315 ../deploy_scenario4a.rst:392 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../scenario_dvr_ovs.rst:324 ../scenario_dvr_ovs.rst:436 #: ../scenario_legacy_ovs.rst:327 ../scenario_legacy_ovs.rst:469 -#: ../scenario_legacy_ovs.rst:556 +#: ../scenario_legacy_ovs.rst:556 ../scenario_provider_ovs.rst:288 +#: ../scenario_provider_ovs.rst:354 msgid "" "The Open vSwitch integration bridge ``br-int`` forwards the packet to the " "Linux bridge ``qbr``." @@ -4416,11 +4414,11 @@ msgid "" "Open vSwitch external bridge ``br-ex``." msgstr "" -#: ../deploy_scenario4a.rst:211 ../deploy_scenario4a.rst:282 -#: ../deploy_scenario4a.rst:368 +#: ../scenario_provider_ovs.rst:201 ../scenario_provider_ovs.rst:263 +#: ../scenario_provider_ovs.rst:335 msgid "" "The Open vSwitch integration bridge ``br-int`` forwards the packet to the " -"Open vSwitch provider bridge ``br-ex``." +"Open vSwitch provider bridge ``br-provider``." msgstr "" # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# @@ -4480,13 +4478,13 @@ msgid "" "contain the internal tag for project network 2." msgstr "" -#: ../deploy_scenario4a.rst:389 +#: ../scenario_provider_ovs.rst:352 msgid "" "The Open vSwitch integration bridge ``br-int`` replaces the actual VLAN tag " "(segmentation ID) of provider network 1 with the internal tag." msgstr "" -#: ../deploy_scenario4a.rst:312 +#: ../scenario_provider_ovs.rst:286 msgid "" "The Open vSwitch integration bridge ``br-int`` replaces the actual VLAN tag " "(segmentation ID) of provider network 2 with the internal tag." @@ -4535,23 +4533,28 @@ msgid "" "contains the instance 1 floating IP address *F1*." msgstr "" -#: ../deploy_scenario4a.rst:309 ../deploy_scenario4a.rst:386 +#: ../scenario_provider_ovs.rst:284 ../scenario_provider_ovs.rst:350 msgid "" -"The Open vSwitch provider bridge ``br-ex`` forwards the packet to the Open " -"vSwitch integration bridge ``br-int``." +"The Open vSwitch provider bridge ``br-provider`` forwards the packet to the " +"Open vSwitch integration bridge ``br-int``." msgstr "" -#: ../deploy_scenario4a.rst:217 +#: ../scenario_provider_ovs.rst:205 msgid "" -"The Open vSwitch provider bridge ``br-ex`` forwards the packet to the " -"physical network via the external network interface." +"The Open vSwitch provider bridge ``br-provider`` forwards the packet to the " +"physical network via the provider network interface." msgstr "" -#: ../deploy_scenario4a.rst:214 ../deploy_scenario4a.rst:285 -#: ../deploy_scenario4a.rst:371 +#: ../scenario_provider_ovs.rst:265 msgid "" -"The Open vSwitch provider bridge ``br-ex`` replaces the internal tag with " -"the actual VLAN tag (segmentation ID) of provider network 1." +"The Open vSwitch provider bridge ``br-provider`` replaces the internal tag " +"with the actual VLAN tag (segmentation ID) of provider network 1." +msgstr "" + +#: ../scenario_provider_ovs.rst:203 ../scenario_provider_ovs.rst:337 +msgid "" +"The Open vSwitch provider bridge ``br-provider`` replaces the internal tag " +"with the actual VLAN tag (segmentation ID) of the provider network." msgstr "" # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# @@ -4761,7 +4764,9 @@ msgid "" "network of eth0 and would be sent directly::" msgstr "" -#: ../deploy_scenario4b.rst:425 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:421 ../scenario_provider_ovs.rst:438 msgid "" "The ``provider`` value in the ``network_vlan_ranges`` option lacks VLAN ID " "ranges to support use of arbitrary VLAN IDs." @@ -4773,12 +4778,12 @@ msgstr "" msgid "The ``qdhcp`` namespace might not appear until launching an instance." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:645 ../deploy_scenario4b.rst:580 -#: ../scenario_legacy_lb.rst:879 ../scenario_legacy_ovs.rst:984 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:576 ../scenario_legacy_lb.rst:879 +#: ../scenario_legacy_ovs.rst:984 ../scenario_provider_ovs.rst:627 msgid "The ``qdhcp`` namespace might not exist until launching an instance." msgstr "" @@ -4788,14 +4793,6 @@ msgid "" "networks." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:113 ../deploy_scenario4b.rst:124 -msgid "" -"The ``qdhcp`` namespaces provide DHCP services for instances using provider " -"networks." -msgstr "" - #: ../scenario_dvr_ovs.rst:254 msgid "" "The ``qg`` interface forwards the packet to the Open vSwitch external bridge " @@ -4810,25 +4807,23 @@ msgid "" "VRRP, state tracking, and failover." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:433 ../deploy_scenario4a.rst:514 -#: ../deploy_scenario4b.rst:386 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:382 ../scenario_provider_ovs.rst:405 msgid "" "The ``service_plugins`` option contains no value because the Networking " "service does not provide layer-3 services such as routing." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:612 ../deploy_scenario4b.rst:542 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:538 ../scenario_provider_ovs.rst:589 msgid "The ``shared`` option allows any project to use this network." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:460 ../deploy_scenario4a.rst:541 -#: ../deploy_scenario4b.rst:421 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:417 ../scenario_provider_ovs.rst:434 msgid "" "The ``tenant_network_types`` option contains no value because the " "architecture does not support project (private) networks." @@ -4851,14 +4846,14 @@ msgid "The compute nodes contain the following components:" msgstr "" # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:135 ../deploy_scenario4a.rst:125 -#: ../deploy_scenario4b.rst:137 ../scenario_dvr_ovs.rst:148 -#: ../scenario_legacy_lb.rst:125 ../scenario_legacy_ovs.rst:131 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario3b.rst:135 ../deploy_scenario4b.rst:133 +#: ../scenario_dvr_ovs.rst:148 ../scenario_legacy_lb.rst:125 +#: ../scenario_legacy_ovs.rst:131 ../scenario_provider_ovs.rst:129 msgid "The compute nodes contain the following network components:" msgstr "" @@ -4872,9 +4867,9 @@ msgstr "" msgid "The compute nodes run the Open vSwitch agent." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:105 ../deploy_scenario4b.rst:116 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:115 ../scenario_provider_ovs.rst:111 msgid "The controller node contains the following network components:" msgstr "" @@ -4901,10 +4896,6 @@ msgid "" "local networks and would be forwarded to the default gateway at 10.0.2.2::" msgstr "" -#: ../deploy_scenario4a.rst:123 ../deploy_scenario4a.rst:144 -msgid "The diagram contains two different provider networks." -msgstr "" - #: ../scenario_dvr_ovs.rst:227 msgid "" "The distributed router ``qrouter`` namespace resolves the project network 1 " @@ -4968,7 +4959,9 @@ msgid "" "create the additional components." msgstr "" -#: ../deploy_scenario4b.rst:44 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:44 ../scenario_provider_ovs.rst:37 msgid "" "The example configuration creates a VLAN provider network. However, it also " "supports flat (untagged or native) provider networks." @@ -5005,12 +4998,6 @@ msgid "" "bridge ``br-ex``. The packet contains destination IP address *F1*." msgstr "" -#: ../deploy_scenario4a.rst:306 ../deploy_scenario4a.rst:383 -msgid "" -"The external network interface forwards the packet to the Open vSwitch " -"provider bridge ``br-ex``." -msgstr "" - #: ../intro_basic_networking.rst:175 msgid "" "The first time host *A* attempts to communicate with host *B*, the " @@ -5068,37 +5055,37 @@ msgid "" "node 1 to the external network:" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:186 ../deploy_scenario4b.rst:188 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:184 ../scenario_provider_ovs.rst:190 msgid "The following steps involve compute node 1." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:267 ../deploy_scenario4a.rst:353 -#: ../deploy_scenario4b.rst:246 ../deploy_scenario4b.rst:311 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:242 ../deploy_scenario4b.rst:307 #: ../scenario_dvr_ovs.rst:213 ../scenario_dvr_ovs.rst:399 #: ../scenario_legacy_lb.rst:174 ../scenario_legacy_lb.rst:301 #: ../scenario_legacy_lb.rst:364 ../scenario_legacy_lb.rst:441 #: ../scenario_legacy_ovs.rst:179 ../scenario_legacy_ovs.rst:307 #: ../scenario_legacy_ovs.rst:370 ../scenario_legacy_ovs.rst:507 +#: ../scenario_provider_ovs.rst:252 ../scenario_provider_ovs.rst:324 msgid "The following steps involve compute node 1:" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:304 ../deploy_scenario4a.rst:381 -#: ../deploy_scenario4b.rst:270 ../deploy_scenario4b.rst:329 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:266 ../deploy_scenario4b.rst:325 #: ../scenario_dvr_ovs.rst:427 ../scenario_legacy_lb.rst:398 #: ../scenario_legacy_lb.rst:454 ../scenario_legacy_ovs.rst:449 -#: ../scenario_legacy_ovs.rst:536 +#: ../scenario_legacy_ovs.rst:536 ../scenario_provider_ovs.rst:280 +#: ../scenario_provider_ovs.rst:346 msgid "The following steps involve compute node 2:" msgstr "" @@ -5112,11 +5099,11 @@ msgstr "" msgid "The following steps involve the network node:" msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:220 ../deploy_scenario4a.rst:291 -#: ../deploy_scenario4a.rst:377 ../deploy_scenario4b.rst:202 -#: ../deploy_scenario4b.rst:260 ../deploy_scenario4b.rst:325 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:198 ../deploy_scenario4b.rst:256 +#: ../deploy_scenario4b.rst:321 ../scenario_provider_ovs.rst:208 +#: ../scenario_provider_ovs.rst:270 ../scenario_provider_ovs.rst:342 msgid "The following steps involve the physical network infrastructure:" msgstr "" @@ -5144,38 +5131,43 @@ msgid "" "DVR to increase performance." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:99 ../deploy_scenario4b.rst:110 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:109 ../scenario_provider_ovs.rst:105 msgid "" "The general provider network architecture uses physical network " "infrastructure to handle switching and routing of network traffic." msgstr "" +#: ../scenario_provider_ovs.rst:326 +msgid "" +"The instance 1 ``tap`` interface (1) forwards the packet to the Linux bridge " +"``qbr``. The packet contains destination MAC address *I2* because the " +"destination resides on the same network." +msgstr "" + # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../scenario_dvr_ovs.rst:215 ../scenario_legacy_ovs.rst:181 +#: ../scenario_provider_ovs.rst:192 msgid "" "The instance 1 ``tap`` interface (1) forwards the packet to the Linux bridge " "``qbr``. The packet contains destination MAC address *TG* because the " "destination resides on another network." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:198 ../deploy_scenario4a.rst:269 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../scenario_dvr_ovs.rst:401 ../scenario_legacy_ovs.rst:372 +#: ../scenario_provider_ovs.rst:254 msgid "" "The instance 1 ``tap`` interface (1) forwards the packet to the Linux bridge " "``qbr``. The packet contains destination MAC address *TG1* because the " "destination resides on another network." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:355 ../deploy_scenario4b.rst:313 #: ../scenario_legacy_ovs.rst:509 msgid "" "The instance 1 ``tap`` interface (1) forwards the packet to the VLAN bridge " @@ -5183,10 +5175,17 @@ msgid "" "destination resides on the same network." msgstr "" -#: ../deploy_scenario4b.rst:190 +#: ../deploy_scenario4b.rst:309 msgid "" -"The instance 1 ``tap`` interface (1) forwards the packet to the VLAN bridge " -"``qbr``. The packet contains destination MAC address *TG* because the " +"The instance 1 ``tap`` interface (1) forwards the packet to the provider " +"bridge ``qbr``. The packet contains destination MAC address *I2* because the " +"destination resides on the same network." +msgstr "" + +#: ../deploy_scenario4b.rst:186 +msgid "" +"The instance 1 ``tap`` interface (1) forwards the packet to the provider " +"bridge ``qbr``. The packet contains destination MAC address *TG* because the " "destination resides on another network." msgstr "" @@ -5218,9 +5217,9 @@ msgid "" "destination resides on another network." msgstr "" -#: ../deploy_scenario4b.rst:248 +#: ../deploy_scenario4b.rst:244 msgid "" -"The instance 1 ``tap`` interface forwards the packet to the VLAN bridge " +"The instance 1 ``tap`` interface forwards the packet to the provider bridge " "``qbr``. The packet contains destination MAC address *TG1* because the " "destination resides on another network." msgstr "" @@ -5231,14 +5230,14 @@ msgstr "" msgid "The instance receives a packet from a host on the external network." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:162 ../deploy_scenario4b.rst:186 -#: ../scenario_dvr_ovs.rst:207 ../scenario_legacy_lb.rst:168 -#: ../scenario_legacy_ovs.rst:177 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:182 ../scenario_dvr_ovs.rst:207 +#: ../scenario_legacy_lb.rst:168 ../scenario_legacy_ovs.rst:177 +#: ../scenario_provider_ovs.rst:188 msgid "The instance sends a packet to a host on the external network." msgstr "" @@ -5274,9 +5273,9 @@ msgid "" "interfaces and all other routers are placed into backup mode." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:194 ../deploy_scenario4b.rst:355 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:351 ../scenario_provider_ovs.rst:374 msgid "" "The lack of L3 agents in this scenario prevents operation of the " "conventional metadata agent. You must use a configuration drive to provide " @@ -5317,19 +5316,19 @@ msgid "" "node via the physical VLAN interface." msgstr "" -#: ../deploy_scenario4b.rst:257 ../deploy_scenario4b.rst:322 +#: ../deploy_scenario4b.rst:253 ../deploy_scenario4b.rst:318 msgid "" "The logical VLAN interface ``device.sid`` forwards the packet to the " "physical network infrastructure via the physical provider interface." msgstr "" -#: ../deploy_scenario4b.rst:199 +#: ../deploy_scenario4b.rst:195 msgid "" "The logical VLAN interface ``device.sid`` forwards the packet to the " "physical network via the physical provider interface." msgstr "" -#: ../deploy_scenario4b.rst:276 ../deploy_scenario4b.rst:335 +#: ../deploy_scenario4b.rst:272 ../deploy_scenario4b.rst:331 msgid "" "The logical VLAN interface ``device.sid`` forwards the packet to the " "provider bridge ``qbr``." @@ -5467,16 +5466,9 @@ msgid "" "``qbr``." msgstr "" -#: ../deploy_scenario4a.rst:164 -msgid "" -"The physical network infrastructure handles routing (and potentially SNAT/" -"DNAT) between the provider and external network. In this example, external " -"network 1 contains a different IP network than the provider networks to " -"illustrate that the physical network infrastructure can handle routing. " -"However, provider networks also support switching to external networks." -msgstr "" - -#: ../deploy_scenario4b.rst:164 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:160 ../scenario_provider_ovs.rst:166 msgid "" "The physical network infrastructure handles routing and potentially other " "services between the provider and external network. In this case, *provider* " @@ -5487,23 +5479,23 @@ msgid "" "Internet." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:244 ../deploy_scenario4b.rst:221 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:217 ../scenario_provider_ovs.rst:227 msgid "" "The physical network infrastructure handles routing between the provider " "networks." msgstr "" -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4a.rst:338 ../deploy_scenario4b.rst:291 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:287 ../scenario_provider_ovs.rst:304 msgid "" "The physical network infrastructure handles switching within the provider " "network." msgstr "" -#: ../deploy_scenario4b.rst:272 ../deploy_scenario4b.rst:331 +#: ../deploy_scenario4b.rst:268 ../deploy_scenario4b.rst:327 msgid "" "The physical provider interface forwards the packet to the logical VLAN " "interface ``device.sid`` where *device* references the underlying physical " @@ -5541,26 +5533,32 @@ msgid "" "bridge ``br-int``." msgstr "" -#: ../deploy_scenario4b.rst:280 +#: ../deploy_scenario4b.rst:276 msgid "" "The provider bridge ``qbr`` forwards the packet to the ``tap`` interface (6) " "on instance 2." msgstr "" -#: ../deploy_scenario4b.rst:339 +#: ../deploy_scenario4b.rst:335 msgid "" "The provider bridge ``qbr`` forwards the packet to the instance 2 ``tap`` " "interface (5)." msgstr "" -#: ../deploy_scenario4b.rst:195 ../deploy_scenario4b.rst:253 -#: ../deploy_scenario4b.rst:318 +#: ../deploy_scenario4b.rst:191 ../deploy_scenario4b.rst:249 +#: ../deploy_scenario4b.rst:314 msgid "" "The provider bridge ``qbr`` forwards the packet to the logical VLAN " "interface ``device.sid`` where *device* references the underlying physical " "provider interface and *sid* contains the provider network segmentation ID." msgstr "" +#: ../scenario_provider_ovs.rst:282 ../scenario_provider_ovs.rst:348 +msgid "" +"The provider network interface forwards the packet to the Open vSwitch " +"provider bridge ``br-provider``." +msgstr "" + #: ../scenario_legacy_ovs.rst:234 msgid "" "The router namespace ``qrouter`` forwards the packet to the Open vSwitch " @@ -5711,9 +5709,7 @@ msgid "" "Networking service components." msgstr "" -# #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:22 ../deploy_scenario4a.rst:38 +#: ../deploy_scenario3b.rst:22 msgid "" "These prerequisites define the minimum physical infrastructure and OpenStack " "service dependencies that you need to deploy this scenario. For example, the " @@ -5724,6 +5720,19 @@ msgid "" "depends on the Image service to launch an instance." msgstr "" +#: ../scenario_provider_ovs.rst:43 +msgid "" +"These prerequisites define the minimum physical infrastructure and OpenStack " +"service dependencies that you need to deploy this scenario. For example, the " +"Networking service immediately depends on the Identity service and the " +"Compute service immediately depends on the Networking service. These " +"dependencies lack services such as the Image service because the Networking " +"service does not immediately depend on it. However, the Compute service " +"depends on the Image service to launch an instance. The example " +"configuration in this scenario assumes basic configuration knowledge of " +"Networking service components." +msgstr "" + #: ../deploy_scenario4b.rst:50 msgid "" "These prerequisites define the minimum physical infrastructure and OpenStack " @@ -5748,7 +5757,9 @@ msgid "" "content/>`_." msgstr "" -#: ../deploy_scenario4b.rst:513 +# #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:509 ../scenario_provider_ovs.rst:560 msgid "" "This example creates a VLAN provider network. Change the VLAN ID and IP " "address range to values suitable for your environment." @@ -5764,13 +5775,6 @@ msgid "" "This example creates a flat external network and a VXLAN project network." msgstr "" -#: ../deploy_scenario4a.rst:583 -msgid "" -"This example creates a provider network using VLAN 101 and IP network " -"203.0.113.0/24. Change the VLAN ID and IP network to values that are " -"appropriate for your environment." -msgstr "" - #: ../index.rst:11 msgid "" "This guide documents OpenStack Kilo, OpenStack Juno, and OpenStack Icehouse " @@ -5838,7 +5842,7 @@ msgid "" "Networking service using the ML2 plug-in with Linux bridge." msgstr "" -#: ../deploy_scenario4a.rst:5 +#: ../scenario_provider_ovs.rst:5 msgid "" "This scenario describes a provider networks implementation of the OpenStack " "Networking service using the ML2 plug-in with Open vSwitch (OVS)." @@ -6057,14 +6061,6 @@ msgid "" "only one of the routers." msgstr "" -#: ../deploy_scenario4a.rst:188 -msgid "" -"Upon launch, instance 1 gets an IP address from the DHCP server on the " -"controller node and gets metadata by using a configuration drive. After " -"initial configuration, only DHCP renewal traffic interacts with the " -"controller node." -msgstr "" - #: ../deploy_scenario3a.rst:461 msgid "" "Use the following example commands as a template to create initial networks " @@ -6073,15 +6069,15 @@ msgstr "" # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3a.rst:209 ../deploy_scenario3b.rst:203 -#: ../deploy_scenario4a.rst:410 ../deploy_scenario4b.rst:351 -#: ../scenario_dvr_ovs.rst:459 ../scenario_legacy_lb.rst:475 -#: ../scenario_legacy_ovs.rst:572 +#: ../deploy_scenario4b.rst:347 ../scenario_dvr_ovs.rst:459 +#: ../scenario_legacy_lb.rst:475 ../scenario_legacy_ovs.rst:572 +#: ../scenario_provider_ovs.rst:370 msgid "" "Use the following example configuration as a template to deploy this " "scenario in your environment." @@ -6158,16 +6154,16 @@ msgstr "" # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario4b.rst:570 ../scenario_dvr_ovs.rst:915 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario4b.rst:566 ../scenario_dvr_ovs.rst:915 #: ../scenario_legacy_lb.rst:867 ../scenario_legacy_ovs.rst:972 +#: ../scenario_provider_ovs.rst:617 msgid "Verify network operation" msgstr "" # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3a.rst:642 ../deploy_scenario3b.rst:554 -#: ../deploy_scenario4a.rst:637 msgid "Verify operation" msgstr "" @@ -6176,29 +6172,28 @@ msgstr "" # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3a.rst:438 ../deploy_scenario4b.rst:496 +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# +#: ../deploy_scenario3a.rst:438 ../deploy_scenario4b.rst:492 #: ../scenario_dvr_ovs.rst:731 ../scenario_legacy_lb.rst:695 -#: ../scenario_legacy_ovs.rst:799 +#: ../scenario_legacy_ovs.rst:799 ../scenario_provider_ovs.rst:543 msgid "Verify presence and operation of the agents:" msgstr "" -# #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# -#: ../deploy_scenario3b.rst:404 ../deploy_scenario4a.rst:569 +#: ../deploy_scenario3b.rst:404 msgid "Verify presence and operation of the agents::" msgstr "" # #-#-#-#-# deploy_scenario3a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario3b.pot (Networking Guide 0.9) #-#-#-#-# -# #-#-#-#-# deploy_scenario4a.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# deploy_scenario4b.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_dvr_ovs.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_lb.pot (Networking Guide 0.9) #-#-#-#-# # #-#-#-#-# scenario_legacy_ovs.pot (Networking Guide 0.9) #-#-#-#-# +# #-#-#-#-# scenario_provider_ovs.pot (Networking Guide 0.9) #-#-#-#-# #: ../deploy_scenario3a.rst:434 ../deploy_scenario3b.rst:400 -#: ../deploy_scenario4a.rst:565 ../deploy_scenario4b.rst:493 -#: ../scenario_dvr_ovs.rst:728 ../scenario_legacy_lb.rst:692 -#: ../scenario_legacy_ovs.rst:796 +#: ../deploy_scenario4b.rst:489 ../scenario_dvr_ovs.rst:728 +#: ../scenario_legacy_lb.rst:692 ../scenario_legacy_ovs.rst:796 +#: ../scenario_provider_ovs.rst:540 msgid "Verify service operation" msgstr ""