From 16f386183b929d2596f6b964b3b8ab38c2502d0d Mon Sep 17 00:00:00 2001
From: Darragh O'Reilly <dara2002-openstack@yahoo.com>
Date: Fri, 13 Sep 2013 16:59:35 +0100
Subject: [PATCH] Change all external subnet examples to have dhcp disabled

Make consistent use of --disable-dhcp in subnet-create console
examples for external networks. These subnets are used for floating
IP allocation pools and the DHCP attribute does not make sense.
There doesn't seem to be a problem when it is set, but the examples
in the doc might confuse readers if it is.

Bug: 1224992
Change-Id: I09f4cd0e4ab182e491b40aece55119deb99005bb
---
 .../app_demo_routers_with_private_networks.xml                | 4 ++--
 doc/admin-guide-network/app_demo_single_router.xml            | 2 +-
 doc/admin-guide-network/ch_adv_features.xml                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/admin-guide-network/app_demo_routers_with_private_networks.xml b/doc/admin-guide-network/app_demo_routers_with_private_networks.xml
index de22605e10..cdd703db6e 100644
--- a/doc/admin-guide-network/app_demo_routers_with_private_networks.xml
+++ b/doc/admin-guide-network/app_demo_routers_with_private_networks.xml
@@ -415,7 +415,7 @@ Created a new network:
 +---------------------------+--------------------------------------+
 </computeroutput></screen>
 
-<screen><prompt>$</prompt> <userinput>neutron subnet-create Ext-Net 30.0.0.0/24</userinput></screen>
+<screen><prompt>$</prompt> <userinput>neutron subnet-create Ext-Net 30.0.0.0/24 --disable-dhcp</userinput></screen>
 <screen><computeroutput>
 Created a new subnet:
 +------------------+--------------------------------------------+
@@ -424,7 +424,7 @@ Created a new subnet:
 | allocation_pools | {"start": "30.0.0.2", "end": "30.0.0.254"} |
 | cidr             | 30.0.0.0/24                                |
 | dns_nameservers  |                                            |
-| enable_dhcp      | True                                       |
+| enable_dhcp      | False                                      |
 | gateway_ip       | 30.0.0.1                                   |
 | host_routes      |                                            |
 | id               | ba754a55-7ce8-46bb-8d97-aa83f4ffa5f9       |
diff --git a/doc/admin-guide-network/app_demo_single_router.xml b/doc/admin-guide-network/app_demo_single_router.xml
index 05d7383d50..9d6f140971 100644
--- a/doc/admin-guide-network/app_demo_single_router.xml
+++ b/doc/admin-guide-network/app_demo_single_router.xml
@@ -424,7 +424,7 @@ export SERVICE_TOKEN=password</programlisting></para>
                     </note>
                     <screen><prompt>$</prompt> <userinput>neutron subnet-create ext_net \
 --allocation-pool start=7.7.7.130,end=7.7.7.150 \
---gateway 7.7.7.1 7.7.7.0/24 -- --enable_dhcp=False</userinput></screen>
+--gateway 7.7.7.1 7.7.7.0/24 --disable-dhcp</userinput></screen>
                     <screen><computeroutput>+------------------+--------------------------------------------------+
 | Field            | Value                                            |
 +------------------+--------------------------------------------------+
diff --git a/doc/admin-guide-network/ch_adv_features.xml b/doc/admin-guide-network/ch_adv_features.xml
index 56ed5c5d73..c91355d2f0 100644
--- a/doc/admin-guide-network/ch_adv_features.xml
+++ b/doc/admin-guide-network/ch_adv_features.xml
@@ -416,7 +416,7 @@
             <title>Common L3 Workflow</title>
             <para>Create external networks (admin-only)</para>
             <screen><computeroutput>neutron net-create public --router:external=True
-neutron subnet-create public 172.16.1.0/24 </computeroutput></screen>
+neutron subnet-create public 172.16.1.0/24 --disable-dhcp</computeroutput></screen>
             <para>Viewing external networks:</para>
             <screen><computeroutput>neutron net-list -- --router:external=True</computeroutput></screen>
             <para>Creating routers</para>