Merge "Revises fonts and links in networking section of admin guide"

This commit is contained in:
Jenkins 2016-03-28 05:24:50 +00:00 committed by Gerrit Code Review
commit f667244a78
4 changed files with 8 additions and 7 deletions

View File

@ -177,8 +177,9 @@ that API users can dynamically provision and configure. These Networking
routers can connect multiple L2 Networking networks and can also provide
a gateway that connects one or more private L2 networks to a shared
external network. For example, a public network for access to the
Internet. See the *OpenStack Configuration Reference* for details on
common models of deploying Networking L3 routers.
Internet. See the `OpenStack Configuration Reference <http://docs.
openstack.org/liberty/config-reference/content>`_ for details on common
models of deploying Networking L3 routers.
The L3 router provides basic NAT capabilities on gateway ports that
uplink the router to external networks. This router SNATs all traffic by
@ -295,7 +296,7 @@ basic L3 operations:
* - Finds floating IP for a specified VM port.
- .. code-block:: console
$ neutron floatingip-list --port_id ZZZ
$ neutron floatingip-list --port_id INTERNAL_VM_PORT_ID
* - Disassociates a floating IP address.
- .. code-block:: console

View File

@ -301,7 +301,7 @@ capabilities:
**How routers are assigned to L3 agents**
By default, a router is assigned to the L3 agent with the least number
of routers (LeastRoutersScheduler). This can be changed by altering the
router_scheduler_driver setting in the configuration file.
``router_scheduler_driver`` setting in the configuration file.
Configure metering agent
~~~~~~~~~~~~~~~~~~~~~~~~

View File

@ -349,7 +349,7 @@ DHCP agent and remove one from it.
| f28aa126-6edb-4ea5-a81e-8850876bc0a8 | HostB | True | :-) |
+--------------------------------------+-------+----------------+-------+
Both DHCP agents host the ``net2`` network.
Both DHCP agents host the ``net2`` network.
#. Remove a network from a specified DHCP agent.

View File

@ -253,8 +253,8 @@ complete advanced VM creation operations:
|parameter in this case. | |
| | |
| |``$ nova boot --image IMAGE --flavor``|
| | ``FLAVOR --nic net-id=NET-ID,`` |
| | ``v4-fixed-ip=IP-ADDR VM_NAME`` |
| |``FLAVOR --nic net-id=NET-ID,`` |
| |``v4-fixed-ip=IP-ADDR VM_NAME`` |
+-------------------------------------+--------------------------------------+
|Boots a VM that connects to all | |
|networks that are accessible to the | |