openstack/openstack-manuals
Code Issues Proposed changes

Merge "Change all external subnet examples to have dhcp disabled"

Browse Source
This commit is contained in:
Jenkins 2013-09-16 12:47:15 +00:00 committed by Gerrit Code Review
commit 9143072a19
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/admin-guide-network/app_demo_routers_with_private_networks.xml
View File

@ -415,7 +415,7 @@ Created a new network:
+---------------------------+--------------------------------------+ +---------------------------+--------------------------------------+
</computeroutput></screen> </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> <screen><computeroutput>
Created a new subnet: Created a new subnet:
+------------------+--------------------------------------------+ +------------------+--------------------------------------------+
@ -424,7 +424,7 @@ Created a new subnet:
| allocation_pools | {"start": "30.0.0.2", "end": "30.0.0.254"} | | allocation_pools | {"start": "30.0.0.2", "end": "30.0.0.254"} |
| cidr | 30.0.0.0/24 | | cidr | 30.0.0.0/24 |
| dns_nameservers | | | dns_nameservers | |
| enable_dhcp | True | | enable_dhcp | False |
| gateway_ip | 30.0.0.1 | | gateway_ip | 30.0.0.1 |
| host_routes | | | host_routes | |
| id | ba754a55-7ce8-46bb-8d97-aa83f4ffa5f9 | | id | ba754a55-7ce8-46bb-8d97-aa83f4ffa5f9 |

2
doc/admin-guide-network/app_demo_single_router.xml
View File

@ -432,7 +432,7 @@ export SERVICE_TOKEN=password</programlisting></para>
</note> </note>
<screen><prompt>$</prompt> <userinput>neutron subnet-create ext_net \ <screen><prompt>$</prompt> <userinput>neutron subnet-create ext_net \
--allocation-pool start=7.7.7.130,end=7.7.7.150 \ --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>+------------------+--------------------------------------------------+ <screen><computeroutput>+------------------+--------------------------------------------------+
| Field | Value | | Field | Value |
+------------------+--------------------------------------------------+ +------------------+--------------------------------------------------+

2
doc/admin-guide-network/ch_adv_features.xml
View File

@ -416,7 +416,7 @@
<title>Common L3 Workflow</title> <title>Common L3 Workflow</title>
<para>Create external networks (admin-only)</para> <para>Create external networks (admin-only)</para>
<screen><computeroutput>neutron net-create public --router:external=True <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> <para>Viewing external networks:</para>
<screen><computeroutput>neutron net-list -- --router:external=True</computeroutput></screen> <screen><computeroutput>neutron net-list -- --router:external=True</computeroutput></screen>
<para>Creating routers</para> <para>Creating routers</para>