openstack/openstack-manuals
Code Issues Proposed changes

Move network_vlan_range conf to right place

Browse Source 
The neutron configuration has network_vlan_types in the wrong place.
They should be in the tables with their plugins instead of in the common
table 4.1.

NOTE: If someone runs the generator again this change will need to be made
again until the generator is fixed!

Fixes-bug: #1243780
Backport: havana
Change-Id: Ie99afbe1f1ac6071fb1379f0457711976f568461
This commit is contained in:
Justin Hammond 2013-10-23 16:20:39 +00:00
parent e99afbe1f1
commit 38a2f6094f
5 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/common/tables/neutron-cisco.xml
View File

@ -35,6 +35,10 @@
<td>network_node_policy_profile=dhcp_pp</td> <td>network_node_policy_profile=dhcp_pp</td>
<td>(StrOpt) N1K policy profile for network node</td> <td>(StrOpt) N1K policy profile for network node</td>
</tr> </tr>
<tr>
<td>network_vlan_ranges=vlan:1:4095</td>
<td>(StrOpt) N1K Network VLAN Ranges</td>
</tr>
<tr> <tr>
<td>nexus_driver=neutron.plugins.cisco.test.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver</td> <td>nexus_driver=neutron.plugins.cisco.test.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver</td>
<td>(StrOpt) Nexus Driver Name</td> <td>(StrOpt) Nexus Driver Name</td>

24
doc/common/tables/neutron-common.xml
View File

@ -111,30 +111,6 @@
<td>network_device_mtu=None</td> <td>network_device_mtu=None</td>
<td>(IntOpt) MTU setting for device.</td> <td>(IntOpt) MTU setting for device.</td>
</tr> </tr>
<tr>
<td>network_vlan_ranges=</td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;vlan_min&gt;:&lt;vlan_max&gt; or &lt;physical_network&gt;</td>
</tr>
<tr>
<td>network_vlan_ranges=</td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;vlan_min&gt;:&lt;vlan_max&gt; or &lt;physical_network&gt;</td>
</tr>
<tr>
<td>network_vlan_ranges=d,,,e,,,f,,,a,,,u,,,l,,,t,,,:,,,1,,,:,,,1,,,0,,,0,,,0</td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;vlan_min&gt;:&lt;vlan_max&gt; or &lt;physical_network&gt;</td>
</tr>
<tr>
<td>network_vlan_ranges=vlan:1:4095</td>
<td>(StrOpt) N1K Network VLAN Ranges</td>
</tr>
<tr>
<td>network_vlan_ranges=</td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;vlan_min&gt;:&lt;vlan_max&gt; or &lt;physical_network&gt;</td>
</tr>
<tr>
<td>network_vlan_ranges=</td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;vlan_min&gt;:&lt;vlan_max&gt; or &lt;physical_network&gt; specifying physical_network names usable for VLAN provider and tenant networks, as well as ranges of VLAN tags on each available for allocation to tenant networks.</td>
</tr>
<tr> <tr>
<td>ovs_integration_bridge=br-int</td> <td>ovs_integration_bridge=br-int</td>
<td>(StrOpt) Name of Open vSwitch bridge to use</td> <td>(StrOpt) Name of Open vSwitch bridge to use</td>

4
doc/common/tables/neutron-linuxbridge.xml
View File

@ -23,6 +23,10 @@
<td>l2_population=False</td> <td>l2_population=False</td>
<td>(BoolOpt) Use ml2 l2population mechanism driver to learn remote mac and IPs and improve tunnel scalability</td> <td>(BoolOpt) Use ml2 l2population mechanism driver to learn remote mac and IPs and improve tunnel scalability</td>
</tr> </tr>
<tr>
<td>network_vlan_ranges=</td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;vlan_min&gt;:&lt;vlan_max&gt; or &lt;physical_network&gt;</td>
</tr>
<tr> <tr>
<td>physical_interface_mappings=</td> <td>physical_interface_mappings=</td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;physical_interface&gt;</td> <td>(ListOpt) List of &lt;physical_network&gt;:&lt;physical_interface&gt;</td>

4
doc/common/tables/neutron-ml2_flat.xml
View File

@ -19,6 +19,10 @@
<td>flat_networks=</td> <td>flat_networks=</td>
<td>(ListOpt) List of physical_network names with which flat networks can be created. Use * to allow flat networks with arbitrary physical_network names.</td> <td>(ListOpt) List of physical_network names with which flat networks can be created. Use * to allow flat networks with arbitrary physical_network names.</td>
</tr> </tr>
<tr>
<td>network_vlan_ranges=</td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;vlan_min&gt;:&lt;vlan_max&gt; or &lt;physical_network&gt; specifying physical_network names usable for VLAN provider and tenant networks, as well as ranges of VLAN tags on each available for allocation to tenant networks.</td>
</tr>
</tbody> </tbody>
</table> </table>
</para> </para>

4
doc/common/tables/neutron-mlnx.xml
View File

@ -19,6 +19,10 @@
<td>daemon_endpoint=tcp://127.0.0.1:5001</td> <td>daemon_endpoint=tcp://127.0.0.1:5001</td>
<td>(StrOpt) eswitch daemon end point</td> <td>(StrOpt) eswitch daemon end point</td>
</tr> </tr>
<tr>
<td>network_vlan_ranges=d,,,e,,,f,,,a,,,u,,,l,,,t,,,:,,,1,,,:,,,1,,,0,,,0,,,0</td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;vlan_min&gt;:&lt;vlan_max&gt; or &lt;physical_network&gt;</td>
</tr>
<tr> <tr>
<td>request_timeout=3000</td> <td>request_timeout=3000</td>
<td>(IntOpt) The number of milliseconds the agent will wait for response on request to daemon.</td> <td>(IntOpt) The number of milliseconds the agent will wait for response on request to daemon.</td>