From bb9d38971d164b27843014d8fea4f30033a788ae Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Mon, 17 Mar 2014 17:45:49 +0100 Subject: [PATCH] Update flags and tables for neutron Remove unneeded xi:include (metadata agent is not a plug-in) Provide tables for new plugins and ML2 mechanisms To avoid breaking the large tables appearance by using xrefs, the bigswitch table is generated twice (one table for the ML2 mechanism, one table for the standalone plugin). This is a (hopefully) temporary change. Tables generations will probably be updated in Juno. Change-Id: I27573975c83c5b25682135a4ea3ab852fec170ea Closes-Bug: #1291785 Closes-Bug: #1292317 Closes-Bug: #1292318 Closes-Bug: #1294402 Closes-Bug: #1294405 Closes-Bug: #1294961 --- doc/common/tables/neutron-agent.xml | 2 +- doc/common/tables/neutron-api.xml | 2 +- doc/common/tables/neutron-bigswitch.xml | 34 +--- doc/common/tables/neutron-brocade.xml | 2 +- doc/common/tables/neutron-cisco.xml | 25 ++- doc/common/tables/neutron-common.xml | 4 +- doc/common/tables/neutron-compute.xml | 59 +++++++ doc/common/tables/neutron-db.xml | 2 +- doc/common/tables/neutron-debug.xml | 2 +- doc/common/tables/neutron-dhcp_agent.xml | 2 +- doc/common/tables/neutron-embrane.xml | 2 +- doc/common/tables/neutron-embrane_lb.xml | 71 ++++++++ doc/common/tables/neutron-fwaas.xml | 2 +- doc/common/tables/neutron-hyperv_agent.xml | 6 +- doc/common/tables/neutron-kombu.xml | 2 +- doc/common/tables/neutron-l3_agent.xml | 2 +- doc/common/tables/neutron-lbaas.xml | 2 +- .../tables/neutron-linuxbridge_agent.xml | 2 +- doc/common/tables/neutron-logging.xml | 2 +- doc/common/tables/neutron-meta.xml | 6 +- doc/common/tables/neutron-metadata.xml | 2 +- doc/common/tables/neutron-metering_agent.xml | 4 +- doc/common/tables/neutron-midonet.xml | 2 +- doc/common/tables/neutron-ml2.xml | 2 +- doc/common/tables/neutron-ml2_arista.xml | 2 +- doc/common/tables/neutron-ml2_bigswitch.xml | 164 ++++++++++++++++++ doc/common/tables/neutron-ml2_brocade.xml | 2 +- doc/common/tables/neutron-ml2_cisco.xml | 2 +- doc/common/tables/neutron-ml2_flat.xml | 2 +- doc/common/tables/neutron-ml2_gre.xml | 27 +++ doc/common/tables/neutron-ml2_l2pop.xml | 2 +- doc/common/tables/neutron-ml2_ncs.xml | 2 +- doc/common/tables/neutron-ml2_odl.xml | 2 +- doc/common/tables/neutron-ml2_vlan.xml | 27 +++ doc/common/tables/neutron-ml2_vxlan.xml | 2 +- doc/common/tables/neutron-mlnx.xml | 6 +- doc/common/tables/neutron-nec.xml | 10 +- doc/common/tables/neutron-notifier.xml | 2 +- doc/common/tables/neutron-nuage.xml | 55 ++++++ doc/common/tables/neutron-nvsd.xml | 9 +- doc/common/tables/neutron-ofa_agent.xml | 42 +++++ .../tables/neutron-openvswitch_agent.xml | 48 +---- doc/common/tables/neutron-plumgrid.xml | 2 +- doc/common/tables/neutron-policy.xml | 2 +- doc/common/tables/neutron-qpid.xml | 2 +- doc/common/tables/neutron-quotas.xml | 2 +- doc/common/tables/neutron-rabbitmq.xml | 2 +- doc/common/tables/neutron-redis.xml | 2 +- doc/common/tables/neutron-rpc.xml | 13 +- doc/common/tables/neutron-ryu.xml | 2 +- doc/common/tables/neutron-scheduler.xml | 2 +- doc/common/tables/neutron-sdnve.xml | 2 +- doc/common/tables/neutron-securitygroups.xml | 2 +- doc/common/tables/neutron-ssl.xml | 9 +- doc/common/tables/neutron-testing.xml | 2 +- doc/common/tables/neutron-varmour.xml | 2 +- doc/common/tables/neutron-vmware.xml | 2 +- doc/common/tables/neutron-vpn.xml | 2 +- doc/common/tables/neutron-wsgi.xml | 2 +- doc/common/tables/neutron-zeromq.xml | 2 +- .../section_networking-plugins-ml2.xml | 3 +- .../networking/section_networking-plugins.xml | 15 +- .../neutron.flagmappings | 134 ++++++++------ 63 files changed, 636 insertions(+), 217 deletions(-) create mode 100644 doc/common/tables/neutron-compute.xml create mode 100644 doc/common/tables/neutron-embrane_lb.xml create mode 100644 doc/common/tables/neutron-ml2_bigswitch.xml create mode 100644 doc/common/tables/neutron-ml2_gre.xml create mode 100644 doc/common/tables/neutron-ml2_vlan.xml create mode 100644 doc/common/tables/neutron-nuage.xml create mode 100644 doc/common/tables/neutron-ofa_agent.xml diff --git a/doc/common/tables/neutron-agent.xml b/doc/common/tables/neutron-agent.xml index 7c3be590aa..6b0c0fa380 100644 --- a/doc/common/tables/neutron-agent.xml +++ b/doc/common/tables/neutron-agent.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/neutron-api.xml b/doc/common/tables/neutron-api.xml index 27b1a69987..40a48c300a 100644 --- a/doc/common/tables/neutron-api.xml +++ b/doc/common/tables/neutron-api.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for agent
+
diff --git a/doc/common/tables/neutron-bigswitch.xml b/doc/common/tables/neutron-bigswitch.xml index a6cd3f8ab4..022691ad3b 100644 --- a/doc/common/tables/neutron-bigswitch.xml +++ b/doc/common/tables/neutron-bigswitch.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for api
+
@@ -81,18 +81,10 @@ - - - - - - - - @@ -101,14 +93,6 @@ - - - - - - - - @@ -117,14 +101,6 @@ - - - - - - - - @@ -137,18 +113,10 @@ - - - - - - - - diff --git a/doc/common/tables/neutron-brocade.xml b/doc/common/tables/neutron-brocade.xml index d27bc4dea4..190135f0f5 100644 --- a/doc/common/tables/neutron-brocade.xml +++ b/doc/common/tables/neutron-brocade.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for bigswitch
add_meta_server_route = True (BoolOpt) Flag to decide if a route to the metadata server should be injected into the VM
auth_resource = (StrOpt) Nuage provided uri for initial authorization to access VSD
auto_sync_on_failure = True (BoolOpt) If neutron fails to create a resource because the backend controller doesn't know of a dependency, automatically trigger a full data synchronization to the controller.
base_uri = /(StrOpt) Nuage provided base uri to reach out to VSD
cache_connections = True (BoolOpt) Re-use HTTP/HTTPS connections to the controller.consistency_interval = 60 (IntOpt) Time between verifications that the backend controller database is consistent with Neutron
default_floatingip_quota = 254(IntOpt) Per Net Partition quota of floating ips
default_net_partition_name = OpenStackDefaultNetPartition(StrOpt) Default Network partition in which VSD will orchestrate network resources using openstack
neutron_id = neutron-ol (StrOpt) User defined identifier for this Neutron deploymentno_ssl_validation = False (BoolOpt) Disables SSL certificate validation for controllers
organization = system(StrOpt) Organization name in which VSD will orchestrate network resources using openstack
server = localhost:8800(StrOpt) IP Address and Port of Nuage's VSD server
server_auth = None (StrOpt) The username and password for authenticating against the BigSwitch or Floodlight controller.server_timeout = 10 (IntOpt) Maximum number of seconds to wait for proxy request to connect and complete.
serverauth = username:password(StrOpt) Username and password for authentication
servers = localhost:8800 (ListOpt) A comma separated list of BigSwitch or Floodlight servers and port numbers. The plugin proxies the requests to the BigSwitch/Floodlight server, which performs the networking configuration. Only oneserver is needed per deployment, but you may wish todeploy multiple servers to support failover.
serverssl = False(BoolOpt) Boolean for SSL connection with VSD server
ssl_cert_directory = /etc/neutron/plugins/bigswitch/ssl (StrOpt) Directory containing ca_certs and host_certs certificate directories.
+
diff --git a/doc/common/tables/neutron-cisco.xml b/doc/common/tables/neutron-cisco.xml index bc6ebe6ee0..928b393fe3 100644 --- a/doc/common/tables/neutron-cisco.xml +++ b/doc/common/tables/neutron-cisco.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for brocade
+
@@ -53,6 +53,10 @@ + + + + @@ -61,6 +65,14 @@ + + + + + + + + @@ -77,6 +89,10 @@ + + + + @@ -92,6 +108,13 @@ + + + + + + + diff --git a/doc/common/tables/neutron-common.xml b/doc/common/tables/neutron-common.xml index a8a8c08d17..6306e8a422 100644 --- a/doc/common/tables/neutron-common.xml +++ b/doc/common/tables/neutron-common.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for cisco
[CISCO_N1K]
bridge_mappings = (StrOpt) N1K Bridge Mappings
default_network_profile = default_network_profile (StrOpt) N1K default network profiledefault_policy_profile = service_profile (StrOpt) N1K default policy profile
enable_tunneling = True(BoolOpt) N1K Enable Tunneling
integration_bridge = br-int(StrOpt) N1K Integration Bridge
network_node_policy_profile = dhcp_pp (StrOpt) N1K policy profile for network nodetenant_network_type = local (StrOpt) N1K Tenant Network Type
tunnel_bridge = br-tun(StrOpt) N1K Tunnel Bridge
vxlan_id_ranges = 5000:10000 (StrOpt) N1K VXLAN ID Rangesvswitch_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 (StrOpt) Virtual Switch to use
[cisco_csr_ipsec]
status_check_interval = 60(IntOpt) Status check interval for Cisco CSR IPSec connections
[ml2_cisco]
+
@@ -31,7 +31,7 @@ - + diff --git a/doc/common/tables/neutron-compute.xml b/doc/common/tables/neutron-compute.xml new file mode 100644 index 0000000000..86bae07640 --- /dev/null +++ b/doc/common/tables/neutron-compute.xml @@ -0,0 +1,59 @@ + + + +
Description of configuration options for common
(StrOpt) Admin username
agent_down_time = 9agent_down_time = 75 (IntOpt) Seconds to regard the agent is down; should be at least twice report_interval, to be sure the agent is down for good.
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for compute
Configuration option = Default valueDescription
[DEFAULT]
notify_nova_on_port_data_changes = True(BoolOpt) Send notification to nova when port data (fixed_ips/floatingip) changes so nova can update its cache.
notify_nova_on_port_status_changes = True(BoolOpt) Send notification to nova when port status changes
nova_admin_auth_url = http://localhost:5000/v2.0(StrOpt) Authorization URL for connecting to nova in admin context
nova_admin_password = None(StrOpt) Password for connection to nova in admin context
nova_admin_tenant_id = None(StrOpt) The uuid of the admin nova tenant
nova_admin_username = None(StrOpt) Username for connecting to nova in admin context
nova_region_name = None(StrOpt) Name of nova region to use. Useful if keystone manages more than one region.
nova_url = http://127.0.0.1:8774(StrOpt) URL for connection to nova
send_events_interval = 2(IntOpt) Number of seconds between sending events to nova if there are any events to send.
+ diff --git a/doc/common/tables/neutron-db.xml b/doc/common/tables/neutron-db.xml index 00bafbce4f..b99ed6637e 100644 --- a/doc/common/tables/neutron-db.xml +++ b/doc/common/tables/neutron-db.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/neutron-debug.xml b/doc/common/tables/neutron-debug.xml index a368759c2b..1ff8d424ab 100644 --- a/doc/common/tables/neutron-debug.xml +++ b/doc/common/tables/neutron-debug.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for db
+
diff --git a/doc/common/tables/neutron-dhcp_agent.xml b/doc/common/tables/neutron-dhcp_agent.xml index 2e3ab90965..272398a0dc 100644 --- a/doc/common/tables/neutron-dhcp_agent.xml +++ b/doc/common/tables/neutron-dhcp_agent.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for debug
+
diff --git a/doc/common/tables/neutron-embrane.xml b/doc/common/tables/neutron-embrane.xml index 764f15f4a1..465908e41d 100644 --- a/doc/common/tables/neutron-embrane.xml +++ b/doc/common/tables/neutron-embrane.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for dhcp_agent
+
diff --git a/doc/common/tables/neutron-embrane_lb.xml b/doc/common/tables/neutron-embrane_lb.xml new file mode 100644 index 0000000000..cb2b31c7ae --- /dev/null +++ b/doc/common/tables/neutron-embrane_lb.xml @@ -0,0 +1,71 @@ + + + +
Description of configuration options for embrane
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for embrane_lb
Configuration option = Default valueDescription
[heleoslb]
admin_password = None(StrOpt) ESM admin password.
admin_username = None(StrOpt) ESM admin username.
async_requests = None(BoolOpt) Define if the requests have run asynchronously or not
dummy_utif_id = None(StrOpt) Dummy user traffic Security Zone id for LBs
esm_mgmt = None(StrOpt) ESM management root address
inband_id = None(StrOpt) In band Security Zone id for LBs
lb_flavor = small(StrOpt) choose LB image flavor to use, accepted values: small, medium
lb_image = None(StrOpt) Load Balancer image id (Embrane LB)
mgmt_id = None(StrOpt) Management Security Zone id for LBs
oob_id = None(StrOpt) Out of band Security Zone id for LBs
resource_pool_id = None(StrOpt) Shared resource pool id
sync_interval = 60(IntOpt) resource synchronization interval in seconds
+ diff --git a/doc/common/tables/neutron-fwaas.xml b/doc/common/tables/neutron-fwaas.xml index d6a57ef1b7..d7de3da7fe 100644 --- a/doc/common/tables/neutron-fwaas.xml +++ b/doc/common/tables/neutron-fwaas.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/neutron-hyperv_agent.xml b/doc/common/tables/neutron-hyperv_agent.xml index e5a099e4f7..ea27490740 100644 --- a/doc/common/tables/neutron-hyperv_agent.xml +++ b/doc/common/tables/neutron-hyperv_agent.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for fwaas
+
@@ -26,6 +26,10 @@ + + + + diff --git a/doc/common/tables/neutron-kombu.xml b/doc/common/tables/neutron-kombu.xml index 34b137bed9..c1d0d5d0b3 100644 --- a/doc/common/tables/neutron-kombu.xml +++ b/doc/common/tables/neutron-kombu.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for hyperv_agent
local_network_vswitch = private (StrOpt) Private vswitch name used for local networks
metrics_max_retries = 100(IntOpt) Specifies the maximum number of retries to enable Hyper-V's port metrics collection. The agent will try to enable the feature once every polling_interval period for at most metrics_max_retries or until it succeedes.
physical_network_vswitch_mappings = (ListOpt) List of <physical_network>:<vswitch> where the physical networks can be expressed with wildcards, e.g.: ."*:external"
+
diff --git a/doc/common/tables/neutron-l3_agent.xml b/doc/common/tables/neutron-l3_agent.xml index 833d178ad7..f13afda9b6 100644 --- a/doc/common/tables/neutron-l3_agent.xml +++ b/doc/common/tables/neutron-l3_agent.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for kombu
+
diff --git a/doc/common/tables/neutron-lbaas.xml b/doc/common/tables/neutron-lbaas.xml index 3c81ed30c0..a16020ec03 100644 --- a/doc/common/tables/neutron-lbaas.xml +++ b/doc/common/tables/neutron-lbaas.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for l3_agent
+
diff --git a/doc/common/tables/neutron-linuxbridge_agent.xml b/doc/common/tables/neutron-linuxbridge_agent.xml index 987ee67671..c03c05a9b6 100644 --- a/doc/common/tables/neutron-linuxbridge_agent.xml +++ b/doc/common/tables/neutron-linuxbridge_agent.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for lbaas
+
diff --git a/doc/common/tables/neutron-logging.xml b/doc/common/tables/neutron-logging.xml index dac6935cfc..19406fc48f 100644 --- a/doc/common/tables/neutron-logging.xml +++ b/doc/common/tables/neutron-logging.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for linuxbridge_agent
+
diff --git a/doc/common/tables/neutron-meta.xml b/doc/common/tables/neutron-meta.xml index 9c023ac7ae..0ce05d3eb0 100644 --- a/doc/common/tables/neutron-meta.xml +++ b/doc/common/tables/neutron-meta.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for logging
+
@@ -38,6 +38,10 @@ + + + + diff --git a/doc/common/tables/neutron-metadata.xml b/doc/common/tables/neutron-metadata.xml index 7cc7d2f702..aa42d5eaf7 100644 --- a/doc/common/tables/neutron-metadata.xml +++ b/doc/common/tables/neutron-metadata.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for meta
plugin_list = (StrOpt) List of plugins to load
rpc_flavor = (StrOpt) Flavor of which plugin handles RPC
supported_extension_aliases = (StrOpt) Supported extension aliases
+
diff --git a/doc/common/tables/neutron-metering_agent.xml b/doc/common/tables/neutron-metering_agent.xml index 12c717a040..63e0c8cc11 100644 --- a/doc/common/tables/neutron-metering_agent.xml +++ b/doc/common/tables/neutron-metering_agent.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for metadata
+
@@ -30,7 +30,7 @@ - + diff --git a/doc/common/tables/neutron-midonet.xml b/doc/common/tables/neutron-midonet.xml index 5f35e93905..3df3334cb0 100644 --- a/doc/common/tables/neutron-midonet.xml +++ b/doc/common/tables/neutron-midonet.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for metering_agent
[AGENT]
report_interval = 4report_interval = 30 (FloatOpt) Seconds between nodes reporting state to server; should be less than agent_down_time, best if it is half or less than agent_down_time.
+
diff --git a/doc/common/tables/neutron-ml2.xml b/doc/common/tables/neutron-ml2.xml index 1c458fbc59..0c2931014a 100644 --- a/doc/common/tables/neutron-ml2.xml +++ b/doc/common/tables/neutron-ml2.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for midonet
+
diff --git a/doc/common/tables/neutron-ml2_arista.xml b/doc/common/tables/neutron-ml2_arista.xml index 6fb16ec4c9..3dcd565159 100644 --- a/doc/common/tables/neutron-ml2_arista.xml +++ b/doc/common/tables/neutron-ml2_arista.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ml2
+
diff --git a/doc/common/tables/neutron-ml2_bigswitch.xml b/doc/common/tables/neutron-ml2_bigswitch.xml new file mode 100644 index 0000000000..0449fe9578 --- /dev/null +++ b/doc/common/tables/neutron-ml2_bigswitch.xml @@ -0,0 +1,164 @@ + + + +
Description of configuration options for ml2_arista
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for ml2_bigswitch
Configuration option = Default valueDescription
[NOVA]
node_override_vif_802.1qbg = (ListOpt) Nova compute nodes to manually set VIF type to 802.1qbg
node_override_vif_802.1qbh = (ListOpt) Nova compute nodes to manually set VIF type to 802.1qbh
node_override_vif_binding_failed = (ListOpt) Nova compute nodes to manually set VIF type to binding_failed
node_override_vif_bridge = (ListOpt) Nova compute nodes to manually set VIF type to bridge
node_override_vif_hostdev = (ListOpt) Nova compute nodes to manually set VIF type to hostdev
node_override_vif_hyperv = (ListOpt) Nova compute nodes to manually set VIF type to hyperv
node_override_vif_ivs = (ListOpt) Nova compute nodes to manually set VIF type to ivs
node_override_vif_midonet = (ListOpt) Nova compute nodes to manually set VIF type to midonet
node_override_vif_mlnx_direct = (ListOpt) Nova compute nodes to manually set VIF type to mlnx_direct
node_override_vif_other = (ListOpt) Nova compute nodes to manually set VIF type to other
node_override_vif_ovs = (ListOpt) Nova compute nodes to manually set VIF type to ovs
node_override_vif_unbound = (ListOpt) Nova compute nodes to manually set VIF type to unbound
vif_type = ovs(StrOpt) Virtual interface type to configure on Nova compute nodes
vif_types = unbound, binding_failed, ovs, ivs, bridge, 802.1qbg, 802.1qbh, hyperv, midonet, mlnx_direct, hostdev, other(ListOpt) List of allowed vif_type values.
[RESTPROXY]
add_meta_server_route = True(BoolOpt) Flag to decide if a route to the metadata server should be injected into the VM
auto_sync_on_failure = True(BoolOpt) If neutron fails to create a resource because the backend controller doesn't know of a dependency, automatically trigger a full data synchronization to the controller.
cache_connections = True(BoolOpt) Re-use HTTP/HTTPS connections to the controller.
consistency_interval = 60(IntOpt) Time between verifications that the backend controller database is consistent with Neutron
neutron_id = neutron-ol(StrOpt) User defined identifier for this Neutron deployment
no_ssl_validation = False(BoolOpt) Disables SSL certificate validation for controllers
server_auth = None(StrOpt) The username and password for authenticating against the BigSwitch or Floodlight controller.
server_ssl = True(BoolOpt) If True, Use SSL when connecting to the BigSwitch or Floodlight controller.
server_timeout = 10(IntOpt) Maximum number of seconds to wait for proxy request to connect and complete.
servers = localhost:8800(ListOpt) A comma separated list of BigSwitch or Floodlight servers and port numbers. The plugin proxies the requests to the BigSwitch/Floodlight server, which performs the networking configuration. Only oneserver is needed per deployment, but you may wish todeploy multiple servers to support failover.
ssl_cert_directory = /etc/neutron/plugins/bigswitch/ssl(StrOpt) Directory containing ca_certs and host_certs certificate directories.
ssl_sticky = True(BoolOpt) Trust and store the first certificate received for each controller address and use it to validate future connections to that address.
sync_data = False(BoolOpt) Sync data on connect
thread_pool_size = 4(IntOpt) Maximum number of threads to spawn to handle large volumes of port creations.
[RESTPROXYAGENT]
integration_bridge = br-int(StrOpt) Name of integration bridge on compute nodes used for security group insertion.
polling_interval = 5(IntOpt) Seconds between agent checks for port changes
virtual_switch_type = ovs(StrOpt) Virtual switch type.
[ROUTER]
max_router_rules = 200(IntOpt) Maximum number of router rules
tenant_default_router_rule = ['*:any:any:permit'](MultiStrOpt) The default router rules installed in new tenant routers. Repeat the config option for each rule. Format is <tenant>:<source>:<destination>:<action> Use an * to specify default for all tenants.
+ diff --git a/doc/common/tables/neutron-ml2_brocade.xml b/doc/common/tables/neutron-ml2_brocade.xml index 3a3b37f2e0..b124762b0e 100644 --- a/doc/common/tables/neutron-ml2_brocade.xml +++ b/doc/common/tables/neutron-ml2_brocade.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/neutron-ml2_cisco.xml b/doc/common/tables/neutron-ml2_cisco.xml index 1bdfbf8cde..ceb7f0e447 100644 --- a/doc/common/tables/neutron-ml2_cisco.xml +++ b/doc/common/tables/neutron-ml2_cisco.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ml2_brocade
+
diff --git a/doc/common/tables/neutron-ml2_flat.xml b/doc/common/tables/neutron-ml2_flat.xml index 40350e9a7c..f1445a9f3b 100644 --- a/doc/common/tables/neutron-ml2_flat.xml +++ b/doc/common/tables/neutron-ml2_flat.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ml2_cisco
+
diff --git a/doc/common/tables/neutron-ml2_gre.xml b/doc/common/tables/neutron-ml2_gre.xml new file mode 100644 index 0000000000..1b36d8c5de --- /dev/null +++ b/doc/common/tables/neutron-ml2_gre.xml @@ -0,0 +1,27 @@ + + + +
Description of configuration options for ml2_flat
+ + + + + + + + + + + + + + + + + + +
Description of configuration options for ml2_gre
Configuration option = Default valueDescription
[ml2_type_gre]
tunnel_id_ranges = (ListOpt) Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation
+ diff --git a/doc/common/tables/neutron-ml2_l2pop.xml b/doc/common/tables/neutron-ml2_l2pop.xml index 195ca9e19c..21f031baba 100644 --- a/doc/common/tables/neutron-ml2_l2pop.xml +++ b/doc/common/tables/neutron-ml2_l2pop.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/neutron-ml2_ncs.xml b/doc/common/tables/neutron-ml2_ncs.xml index e1abad5084..cc3e37a8bf 100644 --- a/doc/common/tables/neutron-ml2_ncs.xml +++ b/doc/common/tables/neutron-ml2_ncs.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ml2_l2pop
+
diff --git a/doc/common/tables/neutron-ml2_odl.xml b/doc/common/tables/neutron-ml2_odl.xml index 59e37d8552..9f19db40e3 100644 --- a/doc/common/tables/neutron-ml2_odl.xml +++ b/doc/common/tables/neutron-ml2_odl.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ml2_ncs
+
diff --git a/doc/common/tables/neutron-ml2_vlan.xml b/doc/common/tables/neutron-ml2_vlan.xml new file mode 100644 index 0000000000..8e445ad1f1 --- /dev/null +++ b/doc/common/tables/neutron-ml2_vlan.xml @@ -0,0 +1,27 @@ + + + +
Description of configuration options for ml2_odl
+ + + + + + + + + + + + + + + + + + +
Description of configuration options for ml2_vlan
Configuration option = Default valueDescription
[ml2_type_vlan]
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.
+ diff --git a/doc/common/tables/neutron-ml2_vxlan.xml b/doc/common/tables/neutron-ml2_vxlan.xml index 0f7b0fe01a..2a915752a4 100644 --- a/doc/common/tables/neutron-ml2_vxlan.xml +++ b/doc/common/tables/neutron-ml2_vxlan.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/neutron-mlnx.xml b/doc/common/tables/neutron-mlnx.xml index 0be2627a4c..34a033015c 100644 --- a/doc/common/tables/neutron-mlnx.xml +++ b/doc/common/tables/neutron-mlnx.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ml2_vxlan
+
@@ -18,6 +18,10 @@ + + + + diff --git a/doc/common/tables/neutron-nec.xml b/doc/common/tables/neutron-nec.xml index 0fd4769aa1..fd71ecd9f7 100644 --- a/doc/common/tables/neutron-nec.xml +++ b/doc/common/tables/neutron-nec.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for mlnx
[ESWITCH]
apply_profile_patch = False(BoolOpt) Enable server compatibility with old nova
backoff_rate = 2 (IntOpt) backoff rate multiplier for waiting period between retries for request to daemon, i.e. value of 2 will double the request timeout each retry
+
@@ -18,6 +18,10 @@ + + + + @@ -34,6 +38,10 @@ + + + + diff --git a/doc/common/tables/neutron-notifier.xml b/doc/common/tables/neutron-notifier.xml index 14e910c184..41463d020d 100644 --- a/doc/common/tables/neutron-notifier.xml +++ b/doc/common/tables/neutron-notifier.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for nec
[OFC]
api_max_attempts = 3(IntOpt) Maximum attempts per OFC API request.NEC plugin retries API request to OFC when OFC returns ServiceUnavailable (503).The value must be greater than 0.
cert_file = None (StrOpt) Certificate filehost = 127.0.0.1 (StrOpt) Host to connect to
key_file = None(StrOpt) Key file
port = 8888 (StrOpt) Port to connect to
+
diff --git a/doc/common/tables/neutron-nuage.xml b/doc/common/tables/neutron-nuage.xml new file mode 100644 index 0000000000..66cd3c1222 --- /dev/null +++ b/doc/common/tables/neutron-nuage.xml @@ -0,0 +1,55 @@ + + + +
Description of configuration options for notifier
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for nuage
Configuration option = Default valueDescription
[RESTPROXY]
auth_resource = (StrOpt) Nuage provided uri for initial authorization to access VSD
base_uri = /(StrOpt) Nuage provided base uri to reach out to VSD
default_floatingip_quota = 254(IntOpt) Per Net Partition quota of floating ips
default_net_partition_name = OpenStackDefaultNetPartition(StrOpt) Default Network partition in which VSD will orchestrate network resources using openstack
organization = system(StrOpt) Organization name in which VSD will orchestrate network resources using openstack
server = localhost:8800(StrOpt) IP Address and Port of Nuage's VSD server
serverauth = username:password(StrOpt) Username and password for authentication
serverssl = False(BoolOpt) Boolean for SSL connection with VSD server
+ diff --git a/doc/common/tables/neutron-nvsd.xml b/doc/common/tables/neutron-nvsd.xml index efc6cd5fad..0151b16bd8 100644 --- a/doc/common/tables/neutron-nvsd.xml +++ b/doc/common/tables/neutron-nvsd.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
@@ -15,6 +15,13 @@ + + + + + + + diff --git a/doc/common/tables/neutron-ofa_agent.xml b/doc/common/tables/neutron-ofa_agent.xml new file mode 100644 index 0000000000..2406ca14a3 --- /dev/null +++ b/doc/common/tables/neutron-ofa_agent.xml @@ -0,0 +1,42 @@ + + + +
Description of configuration options for nvsd
[AGENT]
integration_bridge = br-int(StrOpt) integration bridge
[nvsd]
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for ofa_agent
Configuration option = Default valueDescription
[DEFAULT]
ofp-listen-host = (StrOpt) openflow listen host
ofp-ssl-listen-port = 6633(IntOpt) openflow ssl listen port
ofp-tcp-listen-port = 6633(IntOpt) openflow tcp listen port
[AGENT]
get_datapath_retry_times = 60(IntOpt) Number of seconds to retry acquiring an Open vSwitch datapath
+ diff --git a/doc/common/tables/neutron-openvswitch_agent.xml b/doc/common/tables/neutron-openvswitch_agent.xml index 2bcb0ca9a8..2745c69799 100644 --- a/doc/common/tables/neutron-openvswitch_agent.xml +++ b/doc/common/tables/neutron-openvswitch_agent.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
@@ -18,18 +18,6 @@ - - - - - - - - - - - - @@ -45,10 +33,6 @@ - - - - @@ -76,26 +60,10 @@ - - - - - - - - - - - - - - - - @@ -143,20 +111,6 @@ - - - - - - - - - - - - - -
Description of configuration options for openvswitch_agent
[DEFAULT]
ofp-listen-host = (StrOpt) openflow listen host
ofp-ssl-listen-port = 6633(IntOpt) openflow ssl listen port
ofp-tcp-listen-port = 6633(IntOpt) openflow tcp listen port
ovs_integration_bridge = br-int (StrOpt) Name of Open vSwitch bridge to use
[AGENT]
get_datapath_retry_times = 60(IntOpt) Number of seconds to retry acquiring an Open vSwitch datapath
l2_population = False (BoolOpt) Use ml2 l2population mechanism driver to learn remote mac and IPs and improve tunnel scalability
[CISCO_N1K]
bridge_mappings = (StrOpt) N1K Bridge Mappings
enable_tunneling = True(BoolOpt) N1K Enable Tunneling
integration_bridge = br-int(StrOpt) N1K Integration Bridge
local_ip = 10.0.0.3 (StrOpt) N1K Local IP
tunnel_bridge = br-tun(StrOpt) N1K Tunnel Bridge
[OVS]
tunnel_type = (StrOpt) The type of tunnels to use when utilizing tunnels, either 'gre' or 'vxlan'
[ml2_type_gre]
tunnel_id_ranges = (ListOpt) Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation
[ml2_type_vlan]
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.
diff --git a/doc/common/tables/neutron-plumgrid.xml b/doc/common/tables/neutron-plumgrid.xml index 59a6c8d258..5685e9e917 100644 --- a/doc/common/tables/neutron-plumgrid.xml +++ b/doc/common/tables/neutron-plumgrid.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/neutron-policy.xml b/doc/common/tables/neutron-policy.xml index 2699b2d4d2..76a95ae023 100644 --- a/doc/common/tables/neutron-policy.xml +++ b/doc/common/tables/neutron-policy.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for plumgrid
+
diff --git a/doc/common/tables/neutron-qpid.xml b/doc/common/tables/neutron-qpid.xml index d0ec72f3a8..06ad2dcdfe 100644 --- a/doc/common/tables/neutron-qpid.xml +++ b/doc/common/tables/neutron-qpid.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for policy
+
diff --git a/doc/common/tables/neutron-quotas.xml b/doc/common/tables/neutron-quotas.xml index 936bfa9401..ae213706f9 100644 --- a/doc/common/tables/neutron-quotas.xml +++ b/doc/common/tables/neutron-quotas.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for qpid
+
diff --git a/doc/common/tables/neutron-rabbitmq.xml b/doc/common/tables/neutron-rabbitmq.xml index 3b86abef4c..7e3be7d7cf 100644 --- a/doc/common/tables/neutron-rabbitmq.xml +++ b/doc/common/tables/neutron-rabbitmq.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for quotas
+
diff --git a/doc/common/tables/neutron-redis.xml b/doc/common/tables/neutron-redis.xml index d862e2ef0a..6ffe69a42c 100644 --- a/doc/common/tables/neutron-redis.xml +++ b/doc/common/tables/neutron-redis.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for rabbitmq
+
diff --git a/doc/common/tables/neutron-rpc.xml b/doc/common/tables/neutron-rpc.xml index 2082bf50bd..4f2cdfffcd 100644 --- a/doc/common/tables/neutron-rpc.xml +++ b/doc/common/tables/neutron-rpc.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for redis
+
@@ -83,17 +83,6 @@ - - - - - - - - - - -
Description of configuration options for rpc
topics = notifications (ListOpt) AMQP topic(s) used for openstack notifications
[DEFAULT]
port = 6379(IntOpt) Use this port to connect to redis host.
password = None(StrOpt) Password for Redis server. (optional)
diff --git a/doc/common/tables/neutron-ryu.xml b/doc/common/tables/neutron-ryu.xml index ddb8a214ac..3287e229c7 100644 --- a/doc/common/tables/neutron-ryu.xml +++ b/doc/common/tables/neutron-ryu.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/neutron-scheduler.xml b/doc/common/tables/neutron-scheduler.xml index 230e7ef80b..e937143b70 100644 --- a/doc/common/tables/neutron-scheduler.xml +++ b/doc/common/tables/neutron-scheduler.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ryu
+
diff --git a/doc/common/tables/neutron-sdnve.xml b/doc/common/tables/neutron-sdnve.xml index 970c443850..fb911c5cb6 100644 --- a/doc/common/tables/neutron-sdnve.xml +++ b/doc/common/tables/neutron-sdnve.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for scheduler
+
diff --git a/doc/common/tables/neutron-securitygroups.xml b/doc/common/tables/neutron-securitygroups.xml index 2408767880..756d7f9bf7 100644 --- a/doc/common/tables/neutron-securitygroups.xml +++ b/doc/common/tables/neutron-securitygroups.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for sdnve
+
diff --git a/doc/common/tables/neutron-ssl.xml b/doc/common/tables/neutron-ssl.xml index e2542c73d7..9a36f47d3d 100644 --- a/doc/common/tables/neutron-ssl.xml +++ b/doc/common/tables/neutron-ssl.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for securitygroups
+
@@ -30,13 +30,6 @@ - - - - - - - diff --git a/doc/common/tables/neutron-testing.xml b/doc/common/tables/neutron-testing.xml index 17cdee021a..14725d4f13 100644 --- a/doc/common/tables/neutron-testing.xml +++ b/doc/common/tables/neutron-testing.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ssl
ssl_key_file = None (StrOpt) Private key file to use when starting the server securely
[OFC]
key_file = None(StrOpt) Key file
[ssl]
+
diff --git a/doc/common/tables/neutron-varmour.xml b/doc/common/tables/neutron-varmour.xml index d6f2f22798..2df7145616 100644 --- a/doc/common/tables/neutron-varmour.xml +++ b/doc/common/tables/neutron-varmour.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for testing
+
diff --git a/doc/common/tables/neutron-vmware.xml b/doc/common/tables/neutron-vmware.xml index 16aa2b6539..cf9616afc2 100644 --- a/doc/common/tables/neutron-vmware.xml +++ b/doc/common/tables/neutron-vmware.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for varmour
+
diff --git a/doc/common/tables/neutron-vpn.xml b/doc/common/tables/neutron-vpn.xml index 23f4042a53..7819fb1c5a 100644 --- a/doc/common/tables/neutron-vpn.xml +++ b/doc/common/tables/neutron-vpn.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for vmware
+
diff --git a/doc/common/tables/neutron-wsgi.xml b/doc/common/tables/neutron-wsgi.xml index f3bee9a84c..328e507f0f 100644 --- a/doc/common/tables/neutron-wsgi.xml +++ b/doc/common/tables/neutron-wsgi.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for vpn
+
diff --git a/doc/common/tables/neutron-zeromq.xml b/doc/common/tables/neutron-zeromq.xml index fde3138b36..4f7f88156b 100644 --- a/doc/common/tables/neutron-zeromq.xml +++ b/doc/common/tables/neutron-zeromq.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for wsgi
+
diff --git a/doc/config-reference/networking/section_networking-plugins-ml2.xml b/doc/config-reference/networking/section_networking-plugins-ml2.xml index f4675fd475..624eda472c 100644 --- a/doc/config-reference/networking/section_networking-plugins-ml2.xml +++ b/doc/config-reference/networking/section_networking-plugins-ml2.xml @@ -63,8 +63,7 @@
Modular Layer 2 (ml2) BigSwitch Mechanism configuration options - +
Modular Layer 2 (ml2) Brocade Mechanism configuration diff --git a/doc/config-reference/networking/section_networking-plugins.xml b/doc/config-reference/networking/section_networking-plugins.xml index afe10ad07a..9198d20e23 100644 --- a/doc/config-reference/networking/section_networking-plugins.xml +++ b/doc/config-reference/networking/section_networking-plugins.xml @@ -70,15 +70,6 @@ href="../../common/tables/neutron-meta.xml" /> </section> - <section xml:id="networking-plugin-metadata"> - <title>Metadata Agent configuration options - The Metadata Agent acts as a proxy for the Compute - metadata service - plug-ins at the same time. - -
MidoNet configuration options @@ -92,6 +83,12 @@ href="../../common/tables/neutron-nec.xml" />
+
+ Nuage configuration options + +
One Convergence NVSD configuration options
Description of configuration options for zeromq