Merge "[networking] Minor formating improvement"

This commit is contained in:
Jenkins 2016-06-02 12:36:51 +00:00 committed by Gerrit Code Review
commit b3dcbdc631
5 changed files with 10 additions and 10 deletions

View File

@ -235,7 +235,7 @@ that is accessible externally. The steps to publish the port in the external
DNS service are the following:
#. Assign a valid domain name to the network's ``dns_domain`` attribute. This
name must end with a ``.``.
name must end with a period (``.``).
#. Boot an instance specifying the externally accessible network.
Alternatively, create a port on the externally accessible network specifying
a valid value to its ``dns_name`` attribute. If the port is going to be used
@ -415,7 +415,7 @@ DNS service in conjunction with the ``dns_name`` of its associated port and the
the following:
#. Assign a valid domain name to the network's ``dns_domain`` attribute. This
name must end with a ``.``.
name must end with a period (``.``).
#. Boot an instance or alternatively, create a port specifying a valid value to
its ``dns_name`` attribute. If the port is going to be used for an instance
boot, the value assigned to ``dns_name`` must be equal to the ``hostname``

View File

@ -232,6 +232,7 @@ For more details, see the
`Configuration Reference <http://docs.openstack.org/mitaka/config-reference/networking/networking_options_reference.html#modular-layer-2-ml2-sr-iov-mechanism-configuration-options>`__.
* MacVTap
No additional configurations required for the mechanism driver. Additional
agent configuration is required. Please see the related section.

View File

@ -24,10 +24,9 @@ enabled:
* ``external-net``
* ``router``
Suggestion: Before the end-user can use the auto-allocation feature, the
operator must create the resources that will be used for the auto-allocated
network topology creation. To perform this task, proceed with the following
steps:
Before the end-user can use the auto-allocation feature, the operator must
create the resources that will be used for the auto-allocated network
topology creation. To perform this task, proceed with the following steps:
#. Set up a default external network

View File

@ -39,5 +39,5 @@ and/or could not be deleted:
Deleted 1 security_group, 2 ports, 1 router, 1 floatingip, 2 networks.
The following resouces could not be deleted: 1 network.
A resource in use by another tenant for example, a shared network
with ports in more than one tenant will prevent it from being deleted.
A resource in use by another tenant, for example, a shared network
with ports in more than one tenant, will prevent it from being deleted.

View File

@ -344,7 +344,7 @@ The following steps involve compute node 1:
VLAN interface ``device.sid`` where *device* references the underlying
physical VLAN interface and *sid* contains the project network
segmentation ID. The packet contains destination MAC address *I2*
because the destination resides the same network.
because the destination resides on the same network.
#. The logical VLAN interface ``device.sid`` forwards the packet to the
compute node 2 via the physical VLAN interface.
@ -397,7 +397,7 @@ Controller node
mechanism_drivers = linuxbridge,macvtap
extension_drivers = port_security
* Configure network mappings and IDs:
* Configure network mappings and ID ranges:
.. code-block:: ini