From 425d254442ffd574add2dcb100bc240a44781c9c Mon Sep 17 00:00:00 2001 From: Justin Hammond Date: Wed, 9 Oct 2013 12:56:56 -0500 Subject: [PATCH] Updates conf reference for neutron ml2 plugin Fixes-Bug: 1229237 Fixes-Bug: 1237662 Change-Id: I6974ea7d857b5186f39913baf43f3a8c321cc4ba --- .../flagmappings/neutron.flagmappings | 120 ++++++++++-------- 1 file changed, 65 insertions(+), 55 deletions(-) diff --git a/autogenerate-config-docs/flagmappings/neutron.flagmappings b/autogenerate-config-docs/flagmappings/neutron.flagmappings index b944956d..cb57cc9a 100644 --- a/autogenerate-config-docs/flagmappings/neutron.flagmappings +++ b/autogenerate-config-docs/flagmappings/neutron.flagmappings @@ -4,14 +4,15 @@ admin_password common admin_tenant_name common admin_user common admin_username embrane -agent_boot_time ml2 +agent_boot_time ml2_l2pop agent_down_time agent agent_mode nicira allow_bulk api +allowed_rpc_exception_modules common allow_overlapping_ips policy allow_pagination api allow_sorting api -allowed_rpc_exception_modules common +always_read_status nicira amqp_auto_delete rpc amqp_durable_queues rpc api_extensions_path api @@ -27,7 +28,7 @@ backlog wsgi base_mac common bind_host common bind_port common -bridge_mappings openvswitch +bridge_mappings openvswitch_agent cert_file nec concurrent_connections nicira config_base_dir vpn @@ -58,21 +59,21 @@ deployment_container_id nicira dhcp_agent_notification common dhcp_agents_per_network db dhcp_lease_duration common -director plumgrid -director_port plumgrid +director varmour +director_port varmour director_server plumgrid director_server_port plumgrid disable_process_locking common driver nec dummy_utif_id embrane -eapi_host ml2 -eapi_password ml2 -eapi_username ml2 -enable_metrics_collection hyperv -enable_packet_filter nec -enable_tunneling openvswitch -enable_vxlan linuxbridge +eapi_host ml2_arista +eapi_password ml2_arista +eapi_username ml2_arista enabled fwaas +enable_metrics_collection hyperv_agent +enable_packet_filter nec +enable_tunneling openvswitch_agent +enable_vxlan linuxbridge_agent esm_mgmt embrane extension_map meta external_network nicira @@ -80,9 +81,9 @@ external_pids agent fake_rabbit testing fatal_deprecations logging firewall_driver securitygroups -flat_networks ml2 +flat_networks ml2_flat force_gateway_on_subnet common -force_hyperv_utils_v1 hyperv +force_hyperv_utils_v1 hyperv_agent host cisco host common host nec @@ -92,8 +93,9 @@ idle_timeout db inband_id embrane instance_format logging instance_uuid_format logging -int_peer_patch_port openvswitch -integration_bridge openvswitch +integration_bridge openvswitch_agent +interface_driver agent +int_peer_patch_port openvswitch_agent ipsec_config_template vpn ipsec_secret_template vpn ipsec_status_check_interval vpn @@ -102,12 +104,12 @@ kombu_ssl_ca_certs kombu kombu_ssl_certfile kombu kombu_ssl_keyfile kombu kombu_ssl_version kombu -l2_population linuxbridge -l2_population openvswitch +l2_population linuxbridge_agent +l2_population openvswitch_agent l3_plugin_list meta loadbalancer_pool_scheduler_driver lbaas -local_ip openvswitch -local_network_vswitch hyperv +local_ip openvswitch_agent +local_network_vswitch hyperv_agent lock_path common log_config logging log_date_format logging @@ -119,6 +121,7 @@ logging_debug_format_suffix logging logging_default_format_string logging logging_exception_prefix logging mac_generation_retries common +managed_physical_network ml2_cisco manager_uri nicira matchmaker_heartbeat_freq rpc matchmaker_heartbeat_ttl rpc @@ -134,17 +137,16 @@ max_router_rules bigswitch max_routes quotas max_subnet_host_routes common mechanism_drivers ml2 -meta_flavor_driver_mappings common metadata_mode nicira -metadata_proxy_socket metadata +meta_flavor_driver_mappings common mgmt_id embrane midonet_host_uuid_path midonet midonet_uri midonet min_chunk_size nicira min_pool_size db min_sync_req_delay nicira -mode midonet model_class cisco +mode midonet network_auto_schedule scheduler network_device_mtu common network_node_policy_profile cisco @@ -174,25 +176,26 @@ nvp_user nicira oob_id embrane openflow_rest_api ryu ostype brocade -ovs_integration_bridge common -ovs_use_veth common ovsdb_interface ryu ovsdb_ip ryu ovsdb_port ryu +ovs_integration_bridge common +ovs_use_veth common pagination_max_limit api password brocade password midonet password plumgrid password rpc +password varmour periodic_fuzzy_delay common periodic_interval common physical_interface brocade -physical_interface_mappings linuxbridge -physical_network_vswitch_mappings hyperv +physical_interface_mappings linuxbridge_agent +physical_network_vswitch_mappings hyperv_agent plugin_list meta policy_file policy poll_duration cisco -polling_interval hyperv +polling_interval hyperv_agent pool_timeout db port nec port rpc @@ -213,13 +216,13 @@ qpid_tcp_nodelay qpid qpid_topology_version qpid qpid_username qpid quota_driver quotas -quota_firewall quotas quota_firewall_policy quotas +quota_firewall quotas quota_firewall_rule quotas quota_floatingip quotas quota_items quotas -quota_network quotas quota_network_gateway quotas +quota_network quotas quota_packet_filter quotas quota_port quotas quota_router quotas @@ -234,13 +237,13 @@ rabbit_password rabbitmq rabbit_port rabbitmq rabbit_retry_backoff rabbitmq rabbit_retry_interval rabbitmq -rabbit_use_ssl rabbitmq rabbit_userid rabbitmq +rabbit_use_ssl rabbitmq rabbit_virtual_host rabbitmq redirects nicira -region_name ml2 +region_name ml2_arista report_interval agent -req_timeout ml2 +req_timeout nicira request_timeout mlnx resource_pool_id embrane resource_pool_id nicira @@ -268,12 +271,17 @@ rpc_zmq_port zeromq rpc_zmq_topic_backlog zeromq run_external_periodic_tasks api server_auth bigswitch +servers bigswitch server_ssl bigswitch server_timeout bigswitch -servers bigswitch servertimeout plumgrid +service_cache lbaas +service_compression_throughput lbaas +service_ha_pair lbaas service_plugins api service_provider api +service_ssl_throughput lbaas +service_throughput lbaas slave_connection db sqlite_db db sqlite_synchronous db @@ -285,50 +293,52 @@ state_sync_interval nicira supported_extension_aliases meta svi_round_robin cisco sync_data bigswitch -sync_interval ml2 +sync_interval ml2_arista syslog_log_facility logging task_status_check_interval nicira tcp_keepidle wsgi tenant_default_router_rule bigswitch tenant_network_type hyperv tenant_network_type linuxbridge -tenant_network_type openvswitch +tenant_network_type openvswitch_agent tenant_network_types ml2 -timeout ml2 +timeout ml2_ncs topics rpc -tos linuxbridge -ttl linuxbridge -tun_peer_patch_port openvswitch -tunnel_bridge openvswitch -tunnel_id_ranges openvswitch +tos linuxbridge_agent +ttl linuxbridge_agent +tunnel_bridge openvswitch_agent +tunnel_id_ranges openvswitch_agent tunnel_interface ryu tunnel_ip ryu tunnel_key_max ryu tunnel_key_min ryu -tunnel_type openvswitch -tunnel_types openvswitch +tunnel_type openvswitch_agent +tunnel_types openvswitch_agent +tun_peer_patch_port openvswitch_agent type_drivers ml2 -url ml2 -use_fqdn ml2 +url ml2_ncs +use_fqdn ml2_arista +use_namespaces agent +username brocade +username midonet +username plumgrid +user nicira use_ssl nec use_ssl ssl use_stderr logging use_syslog logging use_tpool db -user nicira -username brocade -username midonet -username plumgrid +vdirect_address lbaas verbose logging -veth_mtu openvswitch +veth_mtu openvswitch_agent vif_type bigswitch vif_types bigswitch vlan_name_prefix cisco -vni_ranges ml2 vnic_type mlnx +vni_ranges ml2_vxlan vpn_device_driver vpn vswitch_plugin cisco -vxlan_group linuxbridge -vxlan_group ml2 +vxlan_group linuxbridge_agent +vxlan_group ml2_vxlan vxlan_id_ranges cisco -vxlan_udp_port openvswitch +vxlan_udp_port openvswitch_agent