openstack/openstack-manuals
Code Issues Proposed changes

[Admin-guide-cloud] Move section and add note

Browse Source 
Per blueprint, moved the Networking Arch section
under the Intro section to keep conceptual
overview topics together. Moved an important admin
note about not using nova-network if using the
Networking service into Introduction for better
visibility.

Change-Id: I6eb5fa90845d67e5db8958c0af88142ed2a52eab
implements: blueprint user-guides-reorganised
This commit is contained in:
Linette 2015-10-30 09:30:17 -05:00
parent fc5e3e07e5
commit e581c5389b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/admin-guide-cloud/source/networking.rst
View File

@ -11,9 +11,9 @@ advanced ``neutron`` and ``nova`` command-line interface (CLI) commands.
:maxdepth: 2
networking_introduction.rst
networking_arch.rst
networking_config-plugins.rst
networking_config-agents.rst
networking_arch.rst
networking_config-identity.rst
networking_adv-config.rst
networking_multi-dhcp-agents.rst

7
doc/admin-guide-cloud/source/networking_introduction.rst
View File

@ -14,6 +14,13 @@ For a detailed description of the Networking API abstractions and their
attributes, see the `OpenStack Networking API v2.0
Reference <http://developer.openstack.org/api-ref-networking-v2.html>`__.
.. Note::
If you use the Networking service, do not run the Compute
nova-network service (like you do in traditional Compute deployments).
When you configure networking, see the Compute-related topics in this
Networking section.
Networking API
~~~~~~~~~~~~~~