Merge "Applies conventions to Networking Use section"

This commit is contained in:
Jenkins 2014-02-15 06:22:54 +00:00 committed by Gerrit Code Review
commit 6105d0bd28

View File

@ -3,8 +3,8 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
<title>Use Networking</title>
<para>You can start and stop OpenStack Networking services
using the <systemitem>service</systemitem> command. For
<para>You can manage OpenStack Networking services using
the <systemitem>service</systemitem> command. For
example:</para>
<screen><prompt>#</prompt> <userinput>sudo service neutron-server stop</userinput>
<prompt>#</prompt> <userinput>sudo service neutron-server status</userinput>
@ -20,8 +20,7 @@
<itemizedlist>
<listitem>
<para>Expose the Networking API to cloud tenants,
which enables them to build rich network
topologies.</para>
enabling them to build rich network topologies.</para>
</listitem>
<listitem>
<para>Have the cloud administrator, or an automated
@ -48,10 +47,10 @@
<section xml:id="api_abstractions">
<title>API abstractions</title>
<para>The Networking v2.0 API provides control over
both L2 network topologies and the IP addresses
used on those networks (IP Address Management or
IPAM). There is also an extension to cover basic
L3 forwarding and NAT, which provides capabilities
both L2 network topologies and their allocated
IP addresses (IP Address Management or IPAM).
There is also an extension to cover basic L3
forwarding and NAT, which provides capabilities
similar to <command>nova-network</command>.</para>
<para><table rules="all">
<caption>API abstractions</caption>
@ -77,13 +76,13 @@
<td><emphasis role="bold"
>Subnet</emphasis></td>
<td>Associates a block of IP addresses
and other network configuration,
such as, default gateways or
dns-servers, with an Networking
network. Each subnet represents an
IPv4 or IPv6 address block and, if
needed, each Networking network can
have multiple subnets.</td>
and other network configuration,
such as default gateways or
dns-servers, with an Networking
network. Each subnet represents
an IPv4 or IPv6 address block,
and each Networking network can
have multiple subnets.</td>
</tr>
<tr>
<td><emphasis role="bold"
@ -385,14 +384,13 @@
</section>
<section xml:id="basic_operations">
<title>Basic Networking operations</title>
<para>To learn about advanced capabilities that are
available through the neutron command-line
interface (CLI), read the networking section in
the <link
xlink:href="http://docs.openstack.org/user-guide/content/index.html"
> OpenStack End User Guide</link>.</para>
<para>This table shows example neutron commands that
enable you to complete basic Networking
<para>To learn about advanced capabilities available
through the neutron command-line interface
(CLI), read the networking section in the <link
xlink:href="http://docs.openstack.org/user-guide/content/index.html"
> OpenStack End User Guide</link>.</para>
<para>This table shows example neutron commands
that enable you to complete basic network
operations:</para>
<table rules="all">
<caption>Basic Networking operations</caption>
@ -472,8 +470,8 @@
<?hard-pagebreak?>
<section xml:id="advanced_networking">
<title>Advanced Networking operations</title>
<para>This table shows example neutron commands that
enable you to complete advanced Networking
<para>This table shows example Networking commands
that enable you to complete advanced network
operations:</para>
<table rules="all">
<caption>Advanced Networking operations</caption>
@ -530,9 +528,9 @@
<title>Use Compute with Networking</title>
<section xml:id="basic_workflow_with_nova">
<title>Basic Compute and Networking operations</title>
<para>This table shows example neutron and nova
commands that enable you to complete basic Compute
and Networking operations:</para>
<para>This table shows example neutron and
nova commands that enable you to complete
basic VM networking operations:</para>
<table rules="all">
<caption>Basic Compute and Networking
operations</caption>
@ -567,8 +565,7 @@
</tr>
<tr>
<td>Searches for ports, but shows only the
<option>mac_address</option> for
the port.</td>
<option>mac_address</option> of the port.</td>
<td><screen><prompt>#</prompt> <userinput>neutron port-list --field mac_address --device_id=<replaceable>vm-id</replaceable></userinput></screen></td>
</tr>
<tr>
@ -605,9 +602,9 @@
</section>
<section xml:id="advanced_vm_creation">
<title>Advanced VM creation operations</title>
<para>This table shows example nova and neutron
commands that enable you to complete advanced VM
creation operations:</para>
<para>This table shows example nova and
neutron commands that enable you to
complete advanced VM creation operations:</para>
<table rules="all">
<caption>Advanced VM creation operations</caption>
<col width="40%"/>