Merge "Update neutron flagmappings for Ocata"

This commit is contained in:
Jenkins 2017-03-23 08:39:13 +00:00 committed by Gerrit Code Review
commit 0c3d6d932b
1 changed files with 81 additions and 30 deletions

View File

@ -1,15 +1,12 @@
advertise_mtu dhcp_agent
agent_down_time common
allow_automatic_dhcp_failover common
allow_automatic_l3agent_failover common
allow_automatic_lbaas_agent_failover common
allow_bulk api
allow_overlapping_ips policy
allow_pagination api
allow_sorting api
api_extensions_path api
api_paste_config api
api_workers common
auth_ca_cert common
auth_strategy common
backlog api
base_mac common
@ -24,12 +21,10 @@ core_plugin common
debug lbaas_agent
default_availability_zones common
default_log_levels disable
device_driver lbaas_agent
dhcp_agent_notification common
dhcp_agents_per_network common
dhcp_broadcast_reply common
dhcp_confs common
dhcp_domain common
dhcp_driver dhcp_agent
dhcp_lease_duration common
dhcp_load_type common
@ -54,9 +49,11 @@ fatal_deprecations disable
force_metadata dhcp_agent
global_physnet_mtu common
ha_confs_path l3_agent
ha_keepalived_state_change_server_threads l3_agent
ha_vrrp_advert_int l3_agent
ha_vrrp_auth_password l3_agent
ha_vrrp_auth_type l3_agent
ha_vrrp_health_check_interval l3_agent
host l3_agent dhcp_agent
instance_format disable
instance_uuid_format disable
@ -78,7 +75,6 @@ logging_debug_format_suffix disable
logging_default_format_string disable
logging_exception_prefix disable
logging_user_identity_format disable
mac_generation_retries common
max_allowed_address_pair common
max_dns_nameservers common
max_fixed_ips_per_port common
@ -88,26 +84,12 @@ max_routes quotas
max_rtr_adv_interval common
max_subnet_host_routes common
measure_interval metering_agent
metadata_backlog metadata
metadata_proxy_group metadata
metadata_proxy_shared_secret metadata
metadata_proxy_socket metadata
metadata_proxy_socket_mode metadata
metadata_proxy_user metadata
metadata_proxy_watch_log metadata
metadata_workers metadata
min_l3_agents_per_router l3_agent
min_rtr_adv_interval common
network_auto_schedule scheduler
network_scheduler_driver scheduler
notify_nova_on_port_data_changes compute
notify_nova_on_port_status_changes compute
nova_client_cert compute
nova_client_priv_key compute
nova_metadata_insecure metadata
nova_metadata_ip metadata
nova_metadata_port metadata
nova_metadata_protocol metadata
num_sync_threads dhcp_agent
ovs_integration_bridge openvswitch_agent
ovs_use_veth openvswitch_agent
@ -119,18 +101,26 @@ periodic_fuzzy_delay common
periodic_interval common lbaas_agent
publish_errors disable
ra_confs ipv6_ra
rate_limit_burst disable
rate_limit_except_level disable
rate_limit_interval disable
report_interval common
resync_interval dhcp_agent
retry_until_window api
router_auto_schedule scheduler
router_distributed dvr
router_scheduler_driver scheduler
rpc_ack_timeout_base disable
rpc_ack_timeout_multiplier disable
rpc_backend disable
rpc_cast_timeout disable
rpc_conn_pool_size disable
rpc_message_ttl disable
rpc_poll_timeout disable
rpc_response_timeout disable
rpc_retry_attempts disable
rpc_state_report_workers disable
rpc_thread_pool_size disable
rpc_use_acks disable
rpc_workers disable
rpc_zmq_bind_address disable
rpc_zmq_bind_port_retries disable
@ -145,9 +135,11 @@ rpc_zmq_topic_backlog disable
send_events_interval compute
service_plugins api
state_path common
subscribe_on disable
syslog_log_facility disable
tcp_keepidle api
transport_url disable
use_dynamic_connections disable
use_pub_sub disable
use_router_proxy disable
use_ssl api
@ -161,9 +153,15 @@ web_framework common
wsgi_default_pool_size api
wsgi_keep_alive api
wsgi_log_format api
zmq_failover_connections disable
zmq_immediate disable
zmq_linger disable
zmq_target_expire disable
zmq_target_update disable
zmq_tcp_keepalive disable
zmq_tcp_keepalive_cnt disable
zmq_tcp_keepalive_idle disable
zmq_tcp_keepalive_intvl disable
AGENT/agent_type agent
AGENT/arp_responder openvswitch_agent
AGENT/availability_zone agent
@ -297,11 +295,16 @@ designate/admin_tenant_id designate
designate/admin_tenant_name designate
designate/admin_username designate
designate/allow_reverse_dns_lookup designate
designate/ca_cert designate
designate/auth_section designate
designate/auth_type designate
designate/cafile designate
designate/certfile designate
designate/insecure designate
designate/ipv4_ptr_zone_prefix_size designate
designate/ipv6_ptr_zone_prefix_size designate
designate/keyfile designate
designate/ptr_zone_email designate
designate/timeout designate
designate/url designate
fwaas/agent_version fwaas
fwaas/driver fwaas
@ -310,6 +313,11 @@ haproxy/jinja_config_template lbaas_services
haproxy/loadbalancer_state_path lbaas_agent
haproxy/send_gratuitous_arp lbaas_agent
haproxy/user_group lbaas_agent
healthcheck/backends disable
healthcheck/detailed disable
healthcheck/disable_by_file_path disable
healthcheck/disable_by_file_paths disable
healthcheck/path disable
ipsec/config_base_dir vpnaas_ipsec
ipsec/enable_detailed_logging vpnaas_ipsec
ipsec/ipsec_status_check_interval vpnaas_ipsec
@ -349,6 +357,8 @@ keystone_authtoken/memcache_use_advanced_pool disable
keystone_authtoken/memcached_servers disable
keystone_authtoken/region_name disable
keystone_authtoken/revocation_cache_time disable
keystone_authtoken/service_token_roles disable
keystone_authtoken/service_token_roles_required disable
keystone_authtoken/signing_dir disable
keystone_authtoken/token_cache_time disable
l2pop/agent_boot_time ml2_l2pop
@ -369,7 +379,6 @@ ml2/path_mtu ml2
ml2/physical_network_mtus ml2
ml2/tenant_network_types ml2
ml2/type_drivers ml2
ml2_sriov/supported_pci_vendor_devs ml2_sriov
ml2_type_flat/flat_networks ml2_flat
ml2_type_geneve/max_header_size ml2_geneve
ml2_type_geneve/vni_ranges ml2_geneve
@ -405,9 +414,11 @@ oslo_messaging_amqp/connection_retry_interval_max disable
oslo_messaging_amqp/container_name disable
oslo_messaging_amqp/default_notification_exchange disable
oslo_messaging_amqp/default_notify_timeout disable
oslo_messaging_amqp/default_reply_retry disable
oslo_messaging_amqp/default_reply_timeout disable
oslo_messaging_amqp/default_rpc_exchange disable
oslo_messaging_amqp/default_send_timeout disable
oslo_messaging_amqp/default_sender_link_timeout disable
oslo_messaging_amqp/group_request_prefix disable
oslo_messaging_amqp/idle_timeout disable
oslo_messaging_amqp/link_retry_delay disable
@ -415,6 +426,7 @@ oslo_messaging_amqp/multicast_address disable
oslo_messaging_amqp/notify_address_prefix disable
oslo_messaging_amqp/notify_server_credit disable
oslo_messaging_amqp/password disable
oslo_messaging_amqp/pre_settled disable
oslo_messaging_amqp/reply_link_credit disable
oslo_messaging_amqp/rpc_address_prefix disable
oslo_messaging_amqp/rpc_server_credit disable
@ -429,6 +441,16 @@ oslo_messaging_amqp/ssl_key_password disable
oslo_messaging_amqp/trace disable
oslo_messaging_amqp/unicast_address disable
oslo_messaging_amqp/username disable
oslo_messaging_kafka/conn_pool_min_size disable
oslo_messaging_kafka/conn_pool_ttl disable
oslo_messaging_kafka/consumer_group disable
oslo_messaging_kafka/kafka_consumer_timeout disable
oslo_messaging_kafka/kafka_default_host disable
oslo_messaging_kafka/kafka_default_port disable
oslo_messaging_kafka/kafka_max_fetch_bytes disable
oslo_messaging_kafka/pool_size disable
oslo_messaging_kafka/producer_batch_size disable
oslo_messaging_kafka/producer_batch_timeout disable
oslo_messaging_notifications/driver disable
oslo_messaging_notifications/topics disable
oslo_messaging_notifications/transport_url disable
@ -440,6 +462,7 @@ oslo_messaging_rabbit/default_notification_exchange disable
oslo_messaging_rabbit/default_notification_retry_attempts disable
oslo_messaging_rabbit/default_rpc_exchange disable
oslo_messaging_rabbit/default_rpc_retry_attempts disable
oslo_messaging_rabbit/default_serializer_type disable
oslo_messaging_rabbit/fake_rabbit disable
oslo_messaging_rabbit/frame_max disable
oslo_messaging_rabbit/heartbeat_interval disable
@ -450,10 +473,6 @@ oslo_messaging_rabbit/kombu_compression disable
oslo_messaging_rabbit/kombu_failover_strategy disable
oslo_messaging_rabbit/kombu_missing_consumer_retry_timeout disable
oslo_messaging_rabbit/kombu_reconnect_delay disable
oslo_messaging_rabbit/kombu_ssl_ca_certs disable
oslo_messaging_rabbit/kombu_ssl_certfile disable
oslo_messaging_rabbit/kombu_ssl_keyfile disable
oslo_messaging_rabbit/kombu_ssl_version disable
oslo_messaging_rabbit/notification_listener_prefetch_count disable
oslo_messaging_rabbit/notification_persistence disable
oslo_messaging_rabbit/notification_retry_delay disable
@ -474,7 +493,6 @@ oslo_messaging_rabbit/rabbit_qos_prefetch_count disable
oslo_messaging_rabbit/rabbit_retry_backoff disable
oslo_messaging_rabbit/rabbit_retry_interval disable
oslo_messaging_rabbit/rabbit_transient_queues_ttl disable
oslo_messaging_rabbit/rabbit_use_ssl disable
oslo_messaging_rabbit/rabbit_userid disable
oslo_messaging_rabbit/rabbit_virtual_host disable
oslo_messaging_rabbit/rpc_listener_prefetch_count disable
@ -486,10 +504,19 @@ oslo_messaging_rabbit/rpc_reply_retry_delay disable
oslo_messaging_rabbit/rpc_retry_delay disable
oslo_messaging_rabbit/socket_timeout disable
oslo_messaging_rabbit/ssl disable
oslo_messaging_rabbit/ssl_ca_file disable
oslo_messaging_rabbit/ssl_cert_file disable
oslo_messaging_rabbit/ssl_key_file disable
oslo_messaging_rabbit/ssl_options disable
oslo_messaging_rabbit/ssl_version disable
oslo_messaging_rabbit/tcp_user_timeout disable
oslo_messaging_zmq/rpc_cast_timeout disable
oslo_messaging_zmq/rpc_ack_timeout_base disable
oslo_messaging_zmq/rpc_ack_timeout_multiplier disable
oslo_messaging_zmq/rpc_message_ttl disable
oslo_messaging_zmq/rpc_poll_timeout disable
oslo_messaging_zmq/rpc_retry_attempts disable
oslo_messaging_zmq/rpc_thread_pool_size disable
oslo_messaging_zmq/rpc_use_acks disable
oslo_messaging_zmq/rpc_zmq_bind_address disable
oslo_messaging_zmq/rpc_zmq_bind_port_retries disable
oslo_messaging_zmq/rpc_zmq_contexts disable
@ -500,11 +527,19 @@ oslo_messaging_zmq/rpc_zmq_max_port disable
oslo_messaging_zmq/rpc_zmq_min_port disable
oslo_messaging_zmq/rpc_zmq_serialization disable
oslo_messaging_zmq/rpc_zmq_topic_backlog disable
oslo_messaging_zmq/subscribe_on disable
oslo_messaging_zmq/use_dynamic_connections disable
oslo_messaging_zmq/use_pub_sub disable
oslo_messaging_zmq/use_router_proxy disable
oslo_messaging_zmq/zmq_failover_connections disable
oslo_messaging_zmq/zmq_immediate disable
oslo_messaging_zmq/zmq_linger disable
oslo_messaging_zmq/zmq_target_expire disable
oslo_messaging_zmq/zmq_target_update disable
oslo_messaging_zmq/zmq_tcp_keepalive disable
oslo_messaging_zmq/zmq_tcp_keepalive_cnt disable
oslo_messaging_zmq/zmq_tcp_keepalive_idle disable
oslo_messaging_zmq/zmq_tcp_keepalive_intvl disable
oslo_middleware/enable_proxy_headers_parsing api
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
@ -512,13 +547,26 @@ oslo_policy/policy_default_rule disable
oslo_policy/policy_dirs disable
oslo_policy/policy_file disable
oslo_versionedobjects/fatal_exception_format_errors api
placement/auth_section placement
placement/auth_type placement
placement/endpoint_type placement
placement/region_name placement
pluto/restart_check_config vpnaas_ipsec
pluto/shutdown_check_back_off vpnaas_ipsec
pluto/shutdown_check_retries vpnaas_ipsec
pluto/shutdown_check_timeout vpnaas_ipsec
privsep/capabilities disable
privsep/group disable
privsep/helper_command disable
privsep/user disable
profiler/connection_string common
profiler/enabled common
profiler/es_doc_type common
profiler/es_scroll_size common
profiler/es_scroll_time common
profiler/hmac_keys common
profiler/sentinel_service_name common
profiler/socket_timeout common
profiler/trace_sqlalchemy common
qos/notification_drivers common
radwarev2/child_workflow_template_names lbaas_services
@ -560,3 +608,6 @@ strongswan/ipsec_config_template vpnaas_strongswan
strongswan/ipsec_secret_template vpnaas_strongswan
strongswan/strongswan_config_template vpnaas_strongswan
vpnagent/vpn_device_driver vpnaas
xenapi/connection_password xenapi
xenapi/connection_url xenapi
xenapi/connection_username xenapi