Merge "[networking] Clarify the role of neutron DHCP"

2017-04-12 16:12:16 +00:00 · 2017-04-12 16:12:16 +00:00 · 9bad0254ea
commit 9bad0254ea
parent 6da25f248b 0217bcfebc
1 changed files with 3 additions and 2 deletions
--- a/doc/networking-guide/source/shared/deploy-provider-initialnetworks.txt
+++ b/doc/networking-guide/source/shared/deploy-provider-initialnetworks.txt
@ -54,11 +54,12 @@ simplicity, the following procedure creates one flat provider network.
      | name              | provider1-v4               |
      +-------------------+----------------------------+

-   .. note::
+   .. important::

      Enabling DHCP causes the Networking service to provide DHCP which can
      interfere with existing DHCP services on the physical network
-      infrastructure.
+      infrastructure. Use the ``--no-dhcp`` option to have the subnet managed
+      by existing DHCP services.

 #. Create a IPv6 subnet on the provider network.