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