From 1860952f02db4d9e487fc8ada2b2a9f6a1dfc404 Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@openstack.org>
Date: Wed, 31 Dec 2014 17:41:58 +0800
Subject: [PATCH] Updated flag mappings for K1

This is from the latest run (2014-12-31) of the autogenerate
config docs tool, to generate flag mappings that capture K1 updates.

Change-Id: Ia9a5f73bf8f28311f034a3770bde851894182d01
---
 .../ceilometer.flagmappings                   | 32 +++++-
 .../cinder.flagmappings                       | 61 +++++++++++-
 .../cinder.headers                            |  3 +
 .../glance.flagmappings                       | 19 +++-
 .../heat.flagmappings                         | 20 +++-
 .../keystone.flagmappings                     | 15 ++-
 .../neutron.flagmappings                      | 98 +++++--------------
 .../nova.flagmappings                         | 75 ++++++--------
 8 files changed, 191 insertions(+), 132 deletions(-)

diff --git a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
index 505745dc5f..66f298d214 100644
--- a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
+++ b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
@@ -11,6 +11,7 @@ default_log_levels logging
 dispatcher rpc
 fake_rabbit testing
 fatal_deprecations logging
+fatal_exception_format_errors logging
 glance_control_exchange exchange
 glance_page_size glance
 heat_control_exchange exchange
@@ -19,6 +20,7 @@ http_control_exchanges exchange
 http_timeout common
 hypervisor_inspector inspector
 instance_format logging
+instance_usage_audit_period compute
 instance_uuid_format logging
 ironic_exchange exchange
 keystone_control_exchange exchange
@@ -41,16 +43,21 @@ logging_exception_prefix logging
 matchmaker_heartbeat_freq rpc
 matchmaker_heartbeat_ttl rpc
 memcached_servers common
+monkey_patch testing
+monkey_patch_modules testing
 neutron_control_exchange exchange
 notification_driver amqp
 notification_topics amqp
 notification_workers common
 nova_control_exchange exchange
 nova_http_log_debug debug
+password_length compute
 pipeline_cfg_file api
 policy_default_rule api
 policy_dirs api
 policy_file api
+polling_namespaces common
+pollster_list common
 publish_errors logging
 qpid_heartbeat qpid
 qpid_hostname qpid
@@ -115,12 +122,22 @@ api/enable_reverse_dns_lookup api
 api/host api
 api/pecan_debug api
 api/port api
-central/partitioning_group_prefix common
+cells/bandwidth_update_interval cells
+cells/call_timeout cells
+cells/capabilities cells
+cells/cell_type cells
+cells/enable cells
+cells/manager cells
+cells/mute_child_interval cells
+cells/name cells
+cells/reserve_percent cells
+cells/topic cells
 collector/requeue_sample_on_dispatcher_error collector
 collector/udp_address collector
 collector/udp_port collector
 compute/workload_partitioning common
 coordination/backend_url common
+coordination/check_watchers common
 coordination/heartbeat common
 database/alarm_connection database
 database/backend database
@@ -196,6 +213,19 @@ matchmaker_ring/ringfile redis
 notification/ack_on_event_error events
 notification/messaging_urls rpc
 notification/store_events events
+notification/workload_partitioning events
+oslo_messaging_amqp/allow_insecure_clients rpc
+oslo_messaging_amqp/broadcast_prefix rpc
+oslo_messaging_amqp/container_name rpc
+oslo_messaging_amqp/group_request_prefix rpc
+oslo_messaging_amqp/idle_timeout rpc
+oslo_messaging_amqp/server_request_prefix rpc
+oslo_messaging_amqp/ssl_ca_file rpc
+oslo_messaging_amqp/ssl_cert_file rpc
+oslo_messaging_amqp/ssl_key_file rpc
+oslo_messaging_amqp/ssl_key_password rpc
+oslo_messaging_amqp/trace rpc
+polling/partitioning_group_prefix common
 publisher/metering_secret rpc
 publisher_notifier/metering_driver rpc
 publisher_notifier/metering_topic rpc
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index cb4e52b41d..a20e73a5be 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -20,9 +20,11 @@ backup_driver backups
 backup_manager backups
 backup_metadata_version backups
 backup_name_template backups
+backup_object_number_per_notification backups
 backup_swift_auth backups_swift
 backup_swift_auth_version swift
 backup_swift_container backups_swift
+backup_swift_enable_progress_timer backups_swift
 backup_swift_key backups_swift
 backup_swift_object_size backups_swift
 backup_swift_retry_attempts backups_swift
@@ -30,6 +32,7 @@ backup_swift_retry_backoff backups_swift
 backup_swift_tenant swift
 backup_swift_url backups_swift
 backup_swift_user backups_swift
+backup_timer_interval backups
 backup_topic backups
 backup_tsm_compression backups_tsm
 backup_tsm_password backups_tsm
@@ -37,11 +40,14 @@ backup_tsm_volume_prefix backups_tsm
 capacity_weight_multiplier storage
 cinder_emc_config_file emc
 cinder_huawei_conf_file huawei
+cinder_huawei_sds_conf_file huawei
 cinder_smis_config_file fujitsu_eternus_dx
+client_socket_timeout common
 cloned_volume_same_az zones
 compute_api_class common
 consistencygroup_api_class common
 control_exchange amqp
+coraid_default_repository coraid
 coraid_esm_address coraid
 coraid_group coraid
 coraid_password coraid
@@ -63,11 +69,11 @@ dell_sc_server_folder dellsc
 dell_sc_ssn dellsc
 dell_sc_volume_folder dellsc
 destroy_empty_storage_group emc
-disable_process_locking debug
 dpl_pool prophetstor_dpl
 dpl_port prophetstor_dpl
 driver_client_cert datera
 driver_client_cert_key datera
+driver_use_ssl xio
 enable_new_services common
 enable_v1_api api
 enable_v2_api api
@@ -84,9 +90,14 @@ extra_capabilities api
 fake_rabbit testing
 fatal_deprecations logging
 fatal_exception_format_errors logging
+flashsystem_connection_protocol flashsystem
+flashsystem_multihostmap_enabled flashsystem
+flashsystem_multipath_enabled flashsystem
 fusionio_iocontrol_retry fusionio
 fusionio_iocontrol_targetdelay fusionio
 fusionio_iocontrol_verify_cert fusionio
+gateway_mga violin
+gateway_mgb violin
 glance_api_insecure images
 glance_api_servers images
 glance_api_ssl_compression images
@@ -162,6 +173,11 @@ iscsi_num_targets storage
 iscsi_port storage prophetstor_dpl
 iscsi_target_prefix storage
 iscsi_write_cache storage
+ise_completion_retries xio
+ise_connection_retries xio
+ise_raid xio
+ise_retry_interval xio
+ise_storage_pool xio
 iser_helper storage
 iser_ip_address storage
 iser_num_targets storage
@@ -173,7 +189,6 @@ kombu_ssl_certfile rabbitmq
 kombu_ssl_keyfile rabbitmq
 kombu_ssl_version rabbitmq
 lio_initiator_iqns common
-lock_path common
 log_config_append logging
 log_date_format logging
 log_dir logging
@@ -201,12 +216,15 @@ nas_ip nas
 nas_login nas
 nas_password nas
 nas_private_key nas
+nas_secure_file_operations nas
+nas_secure_file_permissions nas
 nas_ssh_port nas
 naviseccli_path emc
 netapp_controller_ips netapp_eseries_iscsi
 netapp_copyoffload_tool_path netapp_cdot_nfs
 netapp_eseries_host_type netapp_eseries_iscsi
 netapp_login netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs netapp_eseries_iscsi
+netapp_partner_backend_name netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs netapp_eseries_iscsi
 netapp_password netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs netapp_eseries_iscsi
 netapp_sa_password netapp_eseries_iscsi
 netapp_server_hostname netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs netapp_eseries_iscsi
@@ -239,6 +257,7 @@ nexenta_target_prefix nexenta_iscsi
 nexenta_user nexenta_iscsi
 nexenta_volume nexenta_iscsi
 nexenta_volume_compression nexenta_nfs
+nfs_mount_attempts storage_nfs
 nfs_mount_options storage_nfs
 nfs_mount_point_base storage_nfs
 nfs_oversub_ratio storage_nfs
@@ -259,6 +278,9 @@ nova_endpoint_template compute
 num_iser_scan_tries storage
 num_shell_tries common
 num_volume_device_scan_tries storage
+os_privileged_user_name common
+os_privileged_user_password common
+os_privileged_user_tenant common
 os_region_name compute
 osapi_max_limit api
 osapi_max_request_body_size api
@@ -271,6 +293,7 @@ osapi_volume_workers api
 periodic_fuzzy_delay common
 periodic_interval common
 policy_default_rule common
+policy_dirs common
 policy_file common
 publish_errors logging
 pure_api_token pure
@@ -285,6 +308,11 @@ qpid_sasl_mechanisms qpid
 qpid_tcp_nodelay qpid
 qpid_topology_version qpid
 qpid_username qpid
+quobyte_client_cfg quobyte
+quobyte_mount_point_base quobyte
+quobyte_qcow2_volumes quobyte
+quobyte_sparsed_volumes quobyte
+quobyte_volume_url quobyte
 quota_backup_gigabytes quota
 quota_backups quota
 quota_consistencygroups quota
@@ -314,6 +342,7 @@ rbd_store_chunk_size storage_ceph
 rbd_user storage_ceph
 replication_api_class common
 report_interval common
+request_timeout common
 reservation_expire quota
 reserved_percentage common
 restore_discard_excess_bytes backups_ceph
@@ -366,6 +395,7 @@ smbfs_sparsed_volumes smbfs
 smbfs_used_ratio smbfs
 snapshot_name_template backups
 snapshot_same_host backups
+srb_base_urls srb
 ssh_conn_timeout san
 ssh_hosts_key_file common
 ssh_max_pool_conn san
@@ -378,6 +408,8 @@ storage_availability_zone common
 storage_vnx_authentication_type emc
 storage_vnx_pool_name emc
 storage_vnx_security_file_dir emc
+storpool_replication storpool
+storpool_template storpool
 storwize_svc_allow_tenant_qos storwize
 storwize_svc_connection_protocol storwize
 storwize_svc_flashcopy_timeout storwize
@@ -408,6 +440,7 @@ transport_url amqp
 until_refresh common
 use_default_quota_class quota
 use_forwarded_for common
+use_igroups violin
 use_multipath_for_image_xfer images
 use_stderr logging
 use_syslog logging
@@ -445,6 +478,7 @@ volume_transfer_salt_length api
 volume_usage_audit_period storage
 volumes_dir storage
 windows_iscsi_lun_path windows
+wsgi_keep_alive common
 xiv_chap xiv
 xiv_ds8k_connection_type xiv
 xiv_ds8k_proxy xiv
@@ -459,7 +493,10 @@ zadara_vpsa_ip zadara
 zadara_vpsa_poolname zadara
 zadara_vpsa_port zadara
 zadara_vpsa_use_ssl zadara
+zfssa_data_ip zfssa
+zfssa_https_port zfssa
 zfssa_initiator zfssa
+zfssa_initiator_config zfssa
 zfssa_initiator_group zfssa
 zfssa_initiator_password zfssa
 zfssa_initiator_user zfssa
@@ -467,6 +504,12 @@ zfssa_lun_compression zfssa
 zfssa_lun_logbias zfssa
 zfssa_lun_sparse zfssa
 zfssa_lun_volblocksize zfssa
+zfssa_nfs_mount_options zfssa
+zfssa_nfs_pool zfssa
+zfssa_nfs_project zfssa
+zfssa_nfs_share zfssa
+zfssa_nfs_share_compression zfssa
+zfssa_nfs_share_logbias zfssa
 zfssa_pool zfssa
 zfssa_project zfssa
 zfssa_rest_timeout zfssa
@@ -556,8 +599,16 @@ matchmaker_redis/host redis
 matchmaker_redis/password redis
 matchmaker_redis/port redis
 matchmaker_ring/ringfile redis
+oslo_messaging_amqp/allow_insecure_clients rpc
+oslo_messaging_amqp/broadcast_prefix rpc
+oslo_messaging_amqp/container_name rpc
+oslo_messaging_amqp/group_request_prefix rpc
+oslo_messaging_amqp/idle_timeout rpc
+oslo_messaging_amqp/server_request_prefix rpc
+oslo_messaging_amqp/ssl_ca_file rpc
+oslo_messaging_amqp/ssl_cert_file rpc
+oslo_messaging_amqp/ssl_key_file rpc
+oslo_messaging_amqp/ssl_key_password rpc
+oslo_messaging_amqp/trace rpc
 profiler/profiler_enabled profiler
 profiler/trace_sqlalchemy profiler
-ssl/ca_file ca
-ssl/cert_file ca
-ssl/key_file ca
diff --git a/tools/autogenerate-config-flagmappings/cinder.headers b/tools/autogenerate-config-flagmappings/cinder.headers
index 97acf16237..b32ba6419d 100644
--- a/tools/autogenerate-config-flagmappings/cinder.headers
+++ b/tools/autogenerate-config-flagmappings/cinder.headers
@@ -8,6 +8,7 @@ datera Datera volume driver
 dellsc Dell Storage Center volume driver
 emc EMC
 eqlx Dell EqualLogic volume driver
+flashsystem IBM FlashSystem volume river
 fujitsu_eternus_dx Fujitsu ETERNUS DX volume driver
 fusionio Fusion-io driver
 hds-hnas HDS HNAS iSCSI and NFS driver
@@ -31,6 +32,7 @@ nexenta_nfs Nexenta NFS driver
 nimble Nimble driver
 prophetstor_dpl ProphetStor Fibre Channel and iSCSi drivers
 pure Pure Storage driver
+quobyte Quobyte USP volume driver
 san SAN
 san-solaris Solaris SAN
 scality Scality SOFS volume driver
@@ -43,6 +45,7 @@ storage_gpfs GPFS storage
 storage_nfs NFS storage
 storage_xen Xen storage
 storwize IBM Storwise driver
+violin Violin volume driver
 windows Windows
 xiv IBM XIV and DS8000 volume driver
 zadara Zadara Storage driver
diff --git a/tools/autogenerate-config-flagmappings/glance.flagmappings b/tools/autogenerate-config-flagmappings/glance.flagmappings
index f1f3e886ba..3986a0108e 100644
--- a/tools/autogenerate-config-flagmappings/glance.flagmappings
+++ b/tools/autogenerate-config-flagmappings/glance.flagmappings
@@ -26,12 +26,10 @@ default_log_levels logging
 default_publisher_id amqp
 default_swift_reference swift
 delayed_delete imagecache
-disable_process_locking debug
 enable_v1_api api
 enable_v1_registry api
 enable_v2_api api
 enable_v2_registry api
-eventlet_hub api
 fake_rabbit testing
 fatal_deprecations logging
 image_cache_dir imagecache
@@ -54,7 +52,6 @@ kombu_ssl_keyfile rabbitmq
 kombu_ssl_version rabbitmq
 limit_param_default common
 location_strategy api
-lock_path common
 log_config_append logging
 log_date_format logging
 log_dir logging
@@ -74,9 +71,11 @@ notification_driver amqp
 notification_topics amqp
 owner_is_tenant api
 policy_default_rule policy
+policy_dirs policy
 policy_file policy
 property_protection_file common
 property_protection_rule_format common
+public_endpoint api
 publish_errors logging
 pydev_worker_debug_host testing
 pydev_worker_debug_port testing
@@ -185,8 +184,11 @@ glance_store/s3_store_bucket s3
 glance_store/s3_store_bucket_url_format s3
 glance_store/s3_store_create_bucket_on_put s3
 glance_store/s3_store_host s3
+glance_store/s3_store_large_object_chunk_size s3
+glance_store/s3_store_large_object_size s3
 glance_store/s3_store_object_buffer_dir s3
 glance_store/s3_store_secret_key s3
+glance_store/s3_store_thread_pools s3
 glance_store/sheepdog_store_address sheepdog
 glance_store/sheepdog_store_chunk_size sheepdog
 glance_store/sheepdog_store_port sheepdog
@@ -253,6 +255,17 @@ matchmaker_redis/host redis
 matchmaker_redis/password redis
 matchmaker_redis/port redis
 matchmaker_ring/ringfile redis
+oslo_messaging_amqp/allow_insecure_clients rpc
+oslo_messaging_amqp/broadcast_prefix rpc
+oslo_messaging_amqp/container_name rpc
+oslo_messaging_amqp/group_request_prefix rpc
+oslo_messaging_amqp/idle_timeout rpc
+oslo_messaging_amqp/server_request_prefix rpc
+oslo_messaging_amqp/ssl_ca_file rpc
+oslo_messaging_amqp/ssl_cert_file rpc
+oslo_messaging_amqp/ssl_key_file rpc
+oslo_messaging_amqp/ssl_key_password rpc
+oslo_messaging_amqp/trace rpc
 paste_deploy/config_file api
 paste_deploy/flavor api
 profiler/enabled profiler
diff --git a/tools/autogenerate-config-flagmappings/heat.flagmappings b/tools/autogenerate-config-flagmappings/heat.flagmappings
index c0f0f03cd0..b6c95ef0ed 100644
--- a/tools/autogenerate-config-flagmappings/heat.flagmappings
+++ b/tools/autogenerate-config-flagmappings/heat.flagmappings
@@ -10,12 +10,12 @@ default_log_levels logging
 default_notification_level amqp
 default_publisher_id amqp
 deferred_auth_method common
-disable_process_locking debug
 enable_cloud_watch_lite cloudwatch_api
 enable_stack_abandon api
 enable_stack_adopt api
 engine_life_check_timeout rpc
 environment_dir common
+error_wait_time common
 event_purge_batch_size common
 fake_rabbit testing
 fatal_deprecations logging
@@ -38,7 +38,6 @@ kombu_ssl_keyfile rabbitmq
 kombu_ssl_version rabbitmq
 list_notifier_drivers amqp
 loadbalancer_template loadbalancer
-lock_path common
 log_config_append logging
 log_date_format logging
 log_dir logging
@@ -64,6 +63,7 @@ onready notification
 periodic_interval common
 plugin_dirs common
 policy_default_rule api
+policy_dirs api
 policy_file api
 publish_errors logging
 qpid_heartbeat qpid
@@ -247,9 +247,19 @@ matchmaker_redis/host redis
 matchmaker_redis/password redis
 matchmaker_redis/port redis
 matchmaker_ring/ringfile redis
+oslo_messaging_amqp/allow_insecure_clients rpc
+oslo_messaging_amqp/broadcast_prefix rpc
+oslo_messaging_amqp/container_name rpc
+oslo_messaging_amqp/group_request_prefix rpc
+oslo_messaging_amqp/idle_timeout rpc
+oslo_messaging_amqp/server_request_prefix rpc
+oslo_messaging_amqp/ssl_ca_file rpc
+oslo_messaging_amqp/ssl_cert_file rpc
+oslo_messaging_amqp/ssl_key_file rpc
+oslo_messaging_amqp/ssl_key_password rpc
+oslo_messaging_amqp/trace rpc
 paste_deploy/api_paste_config api
 paste_deploy/flavor api
+profiler/profiler_enabled testing
+profiler/trace_sqlalchemy testing
 revision/heat_revision common
-ssl/ca_file api cfn_api cloudwatch_api
-ssl/cert_file api cfn_api cloudwatch_api
-ssl/key_file api cfn_api cloudwatch_api
diff --git a/tools/autogenerate-config-flagmappings/keystone.flagmappings b/tools/autogenerate-config-flagmappings/keystone.flagmappings
index 983a66b1fc..c7497ff9c8 100644
--- a/tools/autogenerate-config-flagmappings/keystone.flagmappings
+++ b/tools/autogenerate-config-flagmappings/keystone.flagmappings
@@ -35,6 +35,7 @@ logging_exception_prefix logging
 matchmaker_heartbeat_freq rpc
 matchmaker_heartbeat_ttl rpc
 max_param_size api
+max_project_tree_depth api
 max_request_body_size api
 max_token_size api
 member_role_id api
@@ -43,6 +44,7 @@ memcached_servers common
 notification_driver amqp
 notification_topics amqp
 policy_default_rule policy
+policy_dirs policy
 policy_file policy
 public_bind_host api
 public_endpoint api
@@ -144,7 +146,6 @@ database/slave_connection database
 database/sqlite_db database
 database/sqlite_synchronous database
 database/use_db_reconnect database
-ec2/driver ec2
 endpoint_filter/driver api
 endpoint_filter/return_all_endpoints_if_no_filter api
 endpoint_policy/driver api
@@ -294,6 +295,17 @@ oauth1/access_token_duration oauth
 oauth1/driver oauth
 oauth1/request_token_duration oauth
 os_inherit/enabled os_inherit
+oslo_messaging_amqp/allow_insecure_clients rpc
+oslo_messaging_amqp/broadcast_prefix rpc
+oslo_messaging_amqp/container_name rpc
+oslo_messaging_amqp/group_request_prefix rpc
+oslo_messaging_amqp/idle_timeout rpc
+oslo_messaging_amqp/server_request_prefix rpc
+oslo_messaging_amqp/ssl_ca_file rpc
+oslo_messaging_amqp/ssl_cert_file rpc
+oslo_messaging_amqp/ssl_key_file rpc
+oslo_messaging_amqp/ssl_key_password rpc
+oslo_messaging_amqp/trace rpc
 paste_deploy/config_file api
 policy/driver policy
 policy/list_limit policy
@@ -334,7 +346,6 @@ ssl/enable ca
 ssl/key_size ca
 ssl/keyfile ca
 ssl/valid_days ca
-stats/driver stats
 token/bind token
 token/cache_time token
 token/caching token
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index 3874ba7cd4..01ad3acbea 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -25,9 +25,10 @@ base_mac common
 bind_host common
 bind_port common
 ca_certs common
-check_child_processes common
 check_child_processes_action common
 check_child_processes_interval common
+client_socket_timeout api
+conn_idle_timeout api
 control_exchange amqp
 core_plugin common
 ctl_cert common
@@ -39,9 +40,9 @@ default_l3_gw_service_uuid vmware
 default_log_levels logging
 default_service_cluster_uuid vmware
 default_tz_uuid vmware
-device_driver lbaas
 dhcp_agent_notification common
 dhcp_agents_per_network common
+dhcp_broadcast_reply common
 dhcp_confs common
 dhcp_delete_namespaces common
 dhcp_domain common
@@ -81,7 +82,6 @@ kombu_ssl_keyfile rabbitmq
 kombu_ssl_version rabbitmq
 l3_ha l3_agent
 l3_ha_net_cidr l3_agent
-loadbalancer_pool_scheduler_driver lbaas
 lock_path common
 log_config_append logging
 log_date_format logging
@@ -100,7 +100,6 @@ max_dns_nameservers common
 max_fixed_ips_per_port common
 max_header_line api
 max_l3_agents_per_router l3_agent
-max_request_body_size api
 max_routes quotas
 max_subnet_host_routes common
 measure_interval metering_agent
@@ -122,6 +121,7 @@ notify_nova_on_port_status_changes compute
 nova_admin_auth_url compute
 nova_admin_password compute
 nova_admin_tenant_id compute
+nova_admin_tenant_name compute
 nova_admin_username compute
 nova_api_insecure compute
 nova_ca_certificates_file compute
@@ -146,6 +146,8 @@ ovs_vsctl_timeout openvswitch_agent
 pagination_max_limit api
 periodic_fuzzy_delay common
 periodic_interval common
+policy_default_rule policy
+policy_dirs policy
 policy_file policy
 publish_errors logging
 qpid_heartbeat qpid
@@ -207,6 +209,7 @@ state_path common
 syslog_log_facility logging
 tcp_keepidle api
 transport_url amqp
+use_helper_for_ns_read l3_agent
 use_namespaces dhcp_agent
 use_ssl logging
 use_stderr logging
@@ -215,7 +218,9 @@ use_syslog_rfc_format logging
 verbose logging
 wsapi_host ryu
 wsapi_port ryu
+wsgi_keep_alive api
 AGENT/arp_responder openvswitch_agent
+AGENT/comment_iptables_rules l3_agent
 AGENT/dont_fragment openvswitch_agent ml2_ofa
 AGENT/enable_distributed_routing openvswitch_agent
 AGENT/enable_metrics_collection hyperv_agent
@@ -233,6 +238,7 @@ AGENT/report_interval metering_agent
 AGENT/root_helper common
 AGENT/rpc_support_old_agents rpc
 AGENT/tunnel_types openvswitch_agent
+AGENT/use_helper_for_ns_read l3_agent
 AGENT/veth_mtu openvswitch_agent
 AGENT/vxlan_udp_port openvswitch_agent
 CISCO/model_class cisco
@@ -253,6 +259,7 @@ CISCO_N1K/local_ip openvswitch_agent
 CISCO_N1K/network_node_policy_profile cisco
 CISCO_N1K/network_vlan_ranges cisco
 CISCO_N1K/poll_duration cisco
+CISCO_N1K/restrict_network_profiles cisco
 CISCO_N1K/restrict_policy_profiles cisco
 CISCO_N1K/tenant_network_type cisco
 CISCO_N1K/tunnel_bridge cisco
@@ -282,10 +289,6 @@ MIDONET/password midonet
 MIDONET/project_id midonet
 MIDONET/provider_router_id midonet
 MIDONET/username midonet
-MLNX/network_vlan_ranges mlnx
-MLNX/physical_network_type mlnx
-MLNX/physical_network_type_mappings mlnx
-MLNX/tenant_network_type mlnx
 NOVA/node_override_vif_802.1qbg bigswitch ml2_bigswitch
 NOVA/node_override_vif_802.1qbh bigswitch ml2_bigswitch
 NOVA/node_override_vif_binding_failed bigswitch ml2_bigswitch
@@ -333,26 +336,14 @@ OFC/insecure_ssl nec
 OFC/key_file nec
 OFC/path_prefix nec
 OFC/port nec
+OFC/support_packet_filter_on_ofc_router nec
 OFC/use_ssl nec
 OVS/bridge_mappings openvswitch_agent
-OVS/enable_tunneling openvswitch_agent
 OVS/int_peer_patch_port openvswitch_agent
 OVS/integration_bridge openvswitch_agent
 OVS/local_ip openvswitch_agent
-OVS/network_vlan_ranges openvswitch_agent
-OVS/openflow_rest_api ryu
-OVS/ovsdb_interface ryu
-OVS/ovsdb_ip ryu
-OVS/ovsdb_port ryu
-OVS/tenant_network_type openvswitch_agent
 OVS/tun_peer_patch_port openvswitch_agent
 OVS/tunnel_bridge openvswitch_agent
-OVS/tunnel_id_ranges openvswitch_agent
-OVS/tunnel_interface ryu
-OVS/tunnel_ip ryu
-OVS/tunnel_key_max ryu
-OVS/tunnel_key_min ryu
-OVS/tunnel_type openvswitch_agent
 OVS/use_veth_interconnection openvswitch_agent
 PHYSICAL_INTERFACE/physical_interface brocade
 PROVIDER/default_router_provider nec
@@ -370,7 +361,10 @@ QUOTAS/quota_firewall_policy quotas
 QUOTAS/quota_firewall_rule quotas
 QUOTAS/quota_floatingip quotas
 QUOTAS/quota_health_monitor quotas
+QUOTAS/quota_healthmonitor quotas
 QUOTAS/quota_items quotas
+QUOTAS/quota_listener quotas
+QUOTAS/quota_loadbalancer quotas
 QUOTAS/quota_member quotas
 QUOTAS/quota_network quotas
 QUOTAS/quota_network_gateway quotas
@@ -450,7 +444,6 @@ cfg_agent/device_connection_timeout cfg_agent
 cfg_agent/hosting_device_dead_timeout cfg_agent
 cfg_agent/routing_svc_helper_class cfg_agent
 cfg_agent/rpc_loop_interval cfg_agent
-cisco_csr_ipsec/status_check_interval cisco
 database/backend database
 database/connection database
 database/connection_debug database
@@ -481,9 +474,6 @@ general/l3_admin_tenant cisco
 general/management_network cisco
 general/service_vm_config_path cisco
 general/templates_path cisco
-haproxy/loadbalancer_state_path lbaas_haproxy
-haproxy/send_gratuitous_arp lbaas_haproxy
-haproxy/user_group lbaas_haproxy
 heleos/admin_password common
 heleos/admin_username embrane
 heleos/async_requests embrane
@@ -494,18 +484,6 @@ heleos/mgmt_id embrane
 heleos/oob_id embrane
 heleos/resource_pool_id embrane
 heleos/router_image embrane
-heleoslb/admin_password embrane_lb
-heleoslb/admin_username embrane_lb
-heleoslb/async_requests embrane_lb
-heleoslb/dummy_utif_id embrane_lb
-heleoslb/esm_mgmt embrane_lb
-heleoslb/inband_id embrane_lb
-heleoslb/lb_flavor embrane_lb
-heleoslb/lb_image embrane_lb
-heleoslb/mgmt_id embrane_lb
-heleoslb/oob_id embrane_lb
-heleoslb/resource_pool_id embrane_lb
-heleoslb/sync_interval embrane_lb
 hosting_devices/csr1kv_booting_time cisco
 hosting_devices/csr1kv_cfgagent_router_driver cisco
 hosting_devices/csr1kv_configdrive_template cisco
@@ -516,8 +494,6 @@ hosting_devices/csr1kv_password cisco
 hosting_devices/csr1kv_plugging_driver cisco
 hosting_devices/csr1kv_username cisco
 hyperv/force_hyperv_utils_v1 hyperv_agent
-ipsec/config_base_dir vpn
-ipsec/ipsec_status_check_interval vpn
 keystone_authtoken/admin_password auth_token
 keystone_authtoken/admin_tenant_name auth_token
 keystone_authtoken/admin_token auth_token
@@ -629,51 +605,30 @@ n1kv/t1_network_profile cisco
 n1kv/t1_port_profile cisco
 n1kv/t2_network_profile cisco
 n1kv/t2_port_profile cisco
-netscaler_driver/netscaler_ncc_password lbaas_netscaler
-netscaler_driver/netscaler_ncc_uri lbaas_netscaler
-netscaler_driver/netscaler_ncc_username lbaas_netscaler
 nvsd/nvsd_ip nvsd
 nvsd/nvsd_passwd nvsd
 nvsd/nvsd_port nvsd
 nvsd/nvsd_retries nvsd
 nvsd/nvsd_user nvsd
 nvsd/request_timeout nvsd
-openswan/ipsec_config_template vpn
-openswan/ipsec_secret_template vpn
+oslo_messaging_amqp/allow_insecure_clients rpc
+oslo_messaging_amqp/broadcast_prefix rpc
+oslo_messaging_amqp/container_name rpc
+oslo_messaging_amqp/group_request_prefix rpc
+oslo_messaging_amqp/idle_timeout rpc
+oslo_messaging_amqp/server_request_prefix rpc
+oslo_messaging_amqp/ssl_ca_file rpc
+oslo_messaging_amqp/ssl_cert_file rpc
+oslo_messaging_amqp/ssl_key_file rpc
+oslo_messaging_amqp/ssl_key_password rpc
+oslo_messaging_amqp/trace rpc
 plumgriddirector/director_server plumgrid
 plumgriddirector/director_server_port plumgrid
 plumgriddirector/driver plumgrid
 plumgriddirector/password plumgrid
 plumgriddirector/servertimeout plumgrid
 plumgriddirector/username plumgrid
-radware/actions_to_skip lbaas_radware
-radware/ha_secondary_address lbaas_radware
-radware/l2_l3_ctor_params lbaas_radware
-radware/l2_l3_setup_params lbaas_radware
-radware/l2_l3_workflow_name lbaas_radware
-radware/l4_action_name lbaas_radware
-radware/l4_workflow_name lbaas_radware
-radware/service_adc_type lbaas_radware
-radware/service_adc_version lbaas_radware
-radware/service_cache lbaas_radware
-radware/service_compression_throughput lbaas_radware
-radware/service_ha_pair lbaas_radware
-radware/service_isl_vlan lbaas_radware
-radware/service_resource_pool_ids lbaas_radware
-radware/service_session_mirroring_enabled lbaas_radware
-radware/service_ssl_throughput lbaas_radware
-radware/service_throughput lbaas_radware
-radware/vdirect_address lbaas_radware
-radware/vdirect_password lbaas_radware
-radware/vdirect_user lbaas_radware
 service_providers/service_provider api
-ssl/ca_file ca
-ssl/cert_file ca
-ssl/key_file ca
-vArmour/director varmour
-vArmour/director_port varmour
-vArmour/password varmour
-vArmour/username varmour
 vcns/datacenter_moid vmware
 vcns/datastore_id vmware
 vcns/deployment_container_id vmware
@@ -683,4 +638,3 @@ vcns/password vmware
 vcns/resource_pool_id vmware
 vcns/task_status_check_interval vmware
 vcns/user vmware
-vpnagent/vpn_device_driver vpn
diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings
index 4441efb1a4..571c19d5bc 100644
--- a/tools/autogenerate-config-flagmappings/nova.flagmappings
+++ b/tools/autogenerate-config-flagmappings/nova.flagmappings
@@ -22,6 +22,7 @@ ca_file ca
 ca_path ca
 cert_manager ca
 cert_topic ca
+client_socket_timeout api
 cnt_vpn_clients network
 compute_available_monitors compute
 compute_driver compute
@@ -32,15 +33,12 @@ compute_stats_class compute
 compute_topic common
 config_drive_format configdrive
 config_drive_skip_versions configdrive
-config_drive_tempdir configdrive
 console_driver xen
 console_host compute
 console_manager compute
 console_public_hostname console
 console_token_ttl console
 console_topic common
-console_vmrc_error_retries xen
-console_vmrc_port xen
 console_xvp_conf xen
 console_xvp_conf_template xen
 console_xvp_log xen
@@ -68,7 +66,6 @@ dhcp_domain network
 dhcp_lease_time network
 dhcpbridge network
 dhcpbridge_flagfile network
-disable_process_locking debug
 disk_allocation_ratio scheduler
 dmz_cidr vpn
 dmz_mask vpn
@@ -76,6 +73,8 @@ dmz_net vpn
 dns_server network
 dns_update_periodic_interval network
 dnsmasq_config_file network
+ebtables_exec_attempts network
+ebtables_retry_interval network
 ec2_dmz_host ec2
 ec2_host ec2
 ec2_listen ec2
@@ -130,6 +129,7 @@ instance_usage_audit_period compute
 instance_uuid_format logging
 instances_path compute
 internal_service_availability_zone availabilityzones
+io_ops_weight_multiplier scheduler
 iptables_bottom_regex network
 iptables_drop_action network
 iptables_top_regex network
@@ -138,6 +138,7 @@ isolated_hosts scheduler
 isolated_images scheduler
 key_file ca
 keys_path ca
+keystone_ec2_insecure ec2
 keystone_ec2_url ec2
 kombu_reconnect_delay rabbitmq
 kombu_ssl_ca_certs rabbitmq
@@ -158,7 +159,6 @@ ldap_dns_user ldap
 linuxnet_interface_driver network
 linuxnet_ovs_integration_bridge network
 live_migration_retry_count livemigration
-lock_path common
 lockout_attempts ec2
 lockout_minutes ec2
 lockout_window ec2
@@ -192,6 +192,7 @@ monkey_patch testing
 monkey_patch_modules testing
 multi_host network
 multi_instance_display_name_template api
+my_block_storage_ip volumes
 my_ip common
 network_allocate_retries network
 network_api_class network
@@ -220,7 +221,6 @@ osapi_compute_workers api
 osapi_glance_link_prefix glance
 osapi_hide_server_address_states api
 osapi_max_limit policy
-osapi_max_request_body_size policy
 ovs_vsctl_timeout network
 password_length policy
 pci_alias pci
@@ -228,6 +228,7 @@ pci_passthrough_whitelist pci
 periodic_enable periodic
 periodic_fuzzy_delay periodic
 policy_default_rule policy
+policy_dirs policy
 policy_file policy
 preallocate_images hypervisor
 project_cert_subject ca
@@ -255,6 +256,7 @@ quota_injected_files quota
 quota_instances quota
 quota_key_pairs quota
 quota_metadata_items quota
+quota_networks quota
 quota_ram quota
 quota_security_group_rules quota
 quota_security_groups quota
@@ -382,45 +384,11 @@ vpn_ip vpn
 vpn_key_suffix vpn
 vpn_start vpn
 wsgi_default_pool_size api
+wsgi_keep_alive api
 wsgi_log_format api
 xvpvncproxy_base_url xvpnvncproxy
 xvpvncproxy_host xvpnvncproxy
 xvpvncproxy_port xvpnvncproxy
-baremetal/db_backend baremetal
-baremetal/deploy_kernel baremetal
-baremetal/deploy_ramdisk baremetal
-baremetal/driver baremetal
-baremetal/flavor_extra_specs baremetal
-baremetal/ipmi_power_retry baremetal
-baremetal/iscsi_iqn_prefix volumes
-baremetal/net_config_template baremetal
-baremetal/power_manager baremetal
-baremetal/pxe_append_params baremetal
-baremetal/pxe_bootfile_name baremetal
-baremetal/pxe_config_template baremetal
-baremetal/pxe_deploy_timeout baremetal
-baremetal/pxe_network_config baremetal
-baremetal/sql_connection baremetal
-baremetal/terminal baremetal
-baremetal/terminal_cert_dir baremetal
-baremetal/terminal_pid_dir baremetal
-baremetal/tftp_root baremetal
-baremetal/tile_pdu_ip tilera
-baremetal/tile_pdu_mgr tilera
-baremetal/tile_pdu_off tilera
-baremetal/tile_pdu_on tilera
-baremetal/tile_pdu_status tilera
-baremetal/tile_power_wait tilera
-baremetal/use_file_injection baremetal
-baremetal/use_unsafe_iscsi baremetal
-baremetal/vif_driver baremetal
-baremetal/virtual_power_host_key baremetal
-baremetal/virtual_power_host_pass baremetal
-baremetal/virtual_power_host_user baremetal
-baremetal/virtual_power_ssh_host baremetal
-baremetal/virtual_power_ssh_port baremetal
-baremetal/virtual_power_type baremetal
-baremetal/volume_driver volumes
 cells/bandwidth_update_interval quota
 cells/call_timeout cells
 cells/capabilities cells
@@ -447,14 +415,16 @@ cells/scheduler_retries scheduler
 cells/scheduler_retry_delay scheduler
 cells/scheduler_weight_classes scheduler
 cells/topic cells
-cinder/api_insecure volumes
-cinder/ca_certificates_file volumes
+cinder/cafile volumes
 cinder/catalog_info volumes
+cinder/certfile volumes
 cinder/cross_az_attach volumes
 cinder/endpoint_template volumes
 cinder/http_retries volumes
-cinder/http_timeout volumes
+cinder/insecure volumes
+cinder/keyfile volumes
 cinder/os_region_name volumes
+cinder/timeout volumes
 conductor/manager conductor
 conductor/topic conductor
 conductor/use_local conductor
@@ -490,6 +460,7 @@ glance/host glance
 glance/num_retries glance
 glance/port glance
 glance/protocol glance
+guestfs/debug debug
 hyperv/config_drive_cdrom configdrive
 hyperv/config_drive_inject_password configdrive
 hyperv/dynamic_memory_ratio hyperv
@@ -589,6 +560,8 @@ libvirt/rescue_ramdisk_id libvirt
 libvirt/rng_dev_path libvirt
 libvirt/scality_sofs_config volumes
 libvirt/scality_sofs_mount_point volumes
+libvirt/smbfs_mount_options volumes
+libvirt/smbfs_mount_point_base volumes
 libvirt/snapshot_compression libvirt
 libvirt/snapshot_image_format libvirt
 libvirt/snapshots_directory libvirt
@@ -631,6 +604,17 @@ neutron/url_timeout neutron
 osapi_v3/enabled apiv3
 osapi_v3/extensions_blacklist apiv3
 osapi_v3/extensions_whitelist apiv3
+oslo_messaging_amqp/allow_insecure_clients rpc
+oslo_messaging_amqp/broadcast_prefix rpc
+oslo_messaging_amqp/container_name rpc
+oslo_messaging_amqp/group_request_prefix rpc
+oslo_messaging_amqp/idle_timeout rpc
+oslo_messaging_amqp/server_request_prefix rpc
+oslo_messaging_amqp/ssl_ca_file rpc
+oslo_messaging_amqp/ssl_cert_file rpc
+oslo_messaging_amqp/ssl_key_file rpc
+oslo_messaging_amqp/ssl_key_password rpc
+oslo_messaging_amqp/trace rpc
 rdp/enabled rdp
 rdp/html5_proxy_base_url rdp
 serial_console/base_url serial_console
@@ -673,6 +657,9 @@ vmware/host_port vmware
 vmware/host_username vmware
 vmware/integration_bridge vmware
 vmware/maximum_objects vmware
+vmware/pbm_default_policy vmware
+vmware/pbm_enabled vmware
+vmware/pbm_wsdl_location vmware
 vmware/task_poll_interval vmware
 vmware/use_linked_clone vmware
 vmware/vlan_interface network