From 38a2f6094f785060d0aca9ca8c2cfa656c066b01 Mon Sep 17 00:00:00 2001 From: Justin Hammond Date: Wed, 23 Oct 2013 16:20:39 +0000 Subject: [PATCH] Move network_vlan_range conf to right place 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 --- doc/common/tables/neutron-cisco.xml | 4 ++++ doc/common/tables/neutron-common.xml | 24 ----------------------- doc/common/tables/neutron-linuxbridge.xml | 4 ++++ doc/common/tables/neutron-ml2_flat.xml | 6 +++++- doc/common/tables/neutron-mlnx.xml | 6 +++++- 5 files changed, 18 insertions(+), 26 deletions(-) diff --git a/doc/common/tables/neutron-cisco.xml b/doc/common/tables/neutron-cisco.xml index dd0546d18f..7f0df3ae53 100644 --- a/doc/common/tables/neutron-cisco.xml +++ b/doc/common/tables/neutron-cisco.xml @@ -35,6 +35,10 @@ network_node_policy_profile=dhcp_pp (StrOpt) N1K policy profile for network node + + network_vlan_ranges=vlan:1:4095 + (StrOpt) N1K Network VLAN Ranges + nexus_driver=neutron.plugins.cisco.test.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver (StrOpt) Nexus Driver Name diff --git a/doc/common/tables/neutron-common.xml b/doc/common/tables/neutron-common.xml index 4ecff821b2..4ca8fac8f6 100644 --- a/doc/common/tables/neutron-common.xml +++ b/doc/common/tables/neutron-common.xml @@ -111,30 +111,6 @@ network_device_mtu=None (IntOpt) MTU setting for device. - - network_vlan_ranges= - (ListOpt) List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> - - - network_vlan_ranges= - (ListOpt) List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> - - - network_vlan_ranges=d,,,e,,,f,,,a,,,u,,,l,,,t,,,:,,,1,,,:,,,1,,,0,,,0,,,0 - (ListOpt) List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> - - - network_vlan_ranges=vlan:1:4095 - (StrOpt) N1K Network VLAN Ranges - - - network_vlan_ranges= - (ListOpt) List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> - - - network_vlan_ranges= - (ListOpt) List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> 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. - ovs_integration_bridge=br-int (StrOpt) Name of Open vSwitch bridge to use diff --git a/doc/common/tables/neutron-linuxbridge.xml b/doc/common/tables/neutron-linuxbridge.xml index d4a6494c5f..dff13bd0e0 100644 --- a/doc/common/tables/neutron-linuxbridge.xml +++ b/doc/common/tables/neutron-linuxbridge.xml @@ -23,6 +23,10 @@ l2_population=False (BoolOpt) Use ml2 l2population mechanism driver to learn remote mac and IPs and improve tunnel scalability + + network_vlan_ranges= + (ListOpt) List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> + physical_interface_mappings= (ListOpt) List of <physical_network>:<physical_interface> diff --git a/doc/common/tables/neutron-ml2_flat.xml b/doc/common/tables/neutron-ml2_flat.xml index a68219850e..b0572583cc 100644 --- a/doc/common/tables/neutron-ml2_flat.xml +++ b/doc/common/tables/neutron-ml2_flat.xml @@ -19,6 +19,10 @@ flat_networks= (ListOpt) List of physical_network names with which flat networks can be created. Use * to allow flat networks with arbitrary physical_network names. + + network_vlan_ranges= + (ListOpt) List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> 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. + - \ No newline at end of file + diff --git a/doc/common/tables/neutron-mlnx.xml b/doc/common/tables/neutron-mlnx.xml index 4101af50cb..6001d7f346 100644 --- a/doc/common/tables/neutron-mlnx.xml +++ b/doc/common/tables/neutron-mlnx.xml @@ -19,6 +19,10 @@ daemon_endpoint=tcp://127.0.0.1:5001 (StrOpt) eswitch daemon end point + + network_vlan_ranges=d,,,e,,,f,,,a,,,u,,,l,,,t,,,:,,,1,,,:,,,1,,,0,,,0,,,0 + (ListOpt) List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> + request_timeout=3000 (IntOpt) The number of milliseconds the agent will wait for response on request to daemon. @@ -29,4 +33,4 @@ - \ No newline at end of file +