From 2c01f03ab7e92da2b6ce92b9fb0fd3ef84ff9075 Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Mon, 12 Aug 2013 15:11:10 +0000 Subject: [PATCH] Update flagmappings Just a quick run of the autogenerate tool to update the flagmappings and tables for nova, cinder and neutron Change-Id: Ic75b54480fc86780577521a7a6faec0335adf400 --- .../flagmappings/cinder.flagmappings | 7 +++ .../flagmappings/glance.flagmappings | 26 ++++++++++- .../flagmappings/neutron.flagmappings | 7 ++- .../flagmappings/nova.flagmappings | 45 ++++++++++++------- 4 files changed, 64 insertions(+), 21 deletions(-) diff --git a/autogenerate-config-docs/flagmappings/cinder.flagmappings b/autogenerate-config-docs/flagmappings/cinder.flagmappings index 8e9292fb..66d81ca9 100644 --- a/autogenerate-config-docs/flagmappings/cinder.flagmappings +++ b/autogenerate-config-docs/flagmappings/cinder.flagmappings @@ -77,11 +77,17 @@ iscsi_ip_address storage iscsi_num_targets storage iscsi_port storage iscsi_target_prefix storage +iser_target_prefix Unknown kombu_ssl_ca_certs rpc +iser_port Unknown kombu_ssl_certfile rpc +iser_num_targets Unknown kombu_ssl_keyfile rpc +iser_ip_address Unknown kombu_ssl_version rpc +keymgr_api_class Unknown lio_initiator_iqns common +iser_helper Unknown lock_path common log_config common log_date_format common @@ -139,6 +145,7 @@ no_snapshot_gb_quota common notification_driver rpc notification_topics rpc num_iscsi_scan_tries common +num_iser_scan_tries Unknown num_shell_tries common osapi_max_limit api osapi_max_request_body_size api diff --git a/autogenerate-config-docs/flagmappings/glance.flagmappings b/autogenerate-config-docs/flagmappings/glance.flagmappings index f615bf73..586d508b 100644 --- a/autogenerate-config-docs/flagmappings/glance.flagmappings +++ b/autogenerate-config-docs/flagmappings/glance.flagmappings @@ -4,28 +4,39 @@ admin_tenant_name registry admin_user registry allow_additional_image_properties common allow_anonymous_access api +allowed_rpc_exception_modules rpc api_limit_max common auth_region registry auth_strategy registry auth_url registry +backdoor_port wsgi backlog common bind_host common bind_port common ca_file ssl cert_file ssl +cinder_catalog_info cinder cleanup_scrubber imagecache +cinder_ca_certificates_file cinder cleanup_scrubber_time imagecache +cinder_http_retries cinder config_file paste +cinder_endpoint_template cinder data_api common +cinder_api_insecure cinder db_auto_create api debug logging -default_log_levels loggin +default_log_levels logging +default_notification_level logging default_store api +default_publisher_id api delayed_delete imagecache enable_v1_api api enable_v2_api api +eventlet_hub wsgi fatal_deprecations logging filesystem_store_datadir filesystem +filesystem_store_metadata_file filesystem flavor paste image_cache_dir imagecache image_cache_driver imagecache @@ -43,15 +54,18 @@ log_date_format logging log_dir logging log_file logging log_format logging -logfile_mode logging logging_context_format_string logging logging_debug_format_suffix logging logging_default_format_string logging logging_exception_prefix logging metadata_encryption_key common +mongodb_store_uri gridfs notifier_strategy common +notification_driver api owner_is_tenant api +os_region_name common policy_default_rule policy +mongodb_store_db gridfs policy_file policy publish_errors logging pydev_worker_debug_host testing @@ -104,14 +118,21 @@ s3_store_object_buffer_dir s3 s3_store_secret_key s3 scrub_time imagecache scrubber_datadir imagecache +send_identity_headers api show_image_direct_url common +sheepdog_store_chunk_size sheepdog sql_connection db +show_multiple_locations api sql_idle_timeout db +sheepdog_store_address sheepdog sql_max_retries db +sheepdog_store_port sheepdog sql_retry_interval db +sqlalchemy_debug db swift_enable_snet swift swift_store_admin_tenants swift swift_store_auth_address swift +swift_store_auth_insecure swift swift_store_auth_version swift swift_store_container swift swift_store_create_container_on_put swift @@ -127,5 +148,6 @@ syslog_log_facility logging tcp_keepidle wsgi use_stderr logging use_syslog logging +use_user_token api verbose logging workers common diff --git a/autogenerate-config-docs/flagmappings/neutron.flagmappings b/autogenerate-config-docs/flagmappings/neutron.flagmappings index 67659154..e6dacc81 100644 --- a/autogenerate-config-docs/flagmappings/neutron.flagmappings +++ b/autogenerate-config-docs/flagmappings/neutron.flagmappings @@ -157,7 +157,7 @@ port nec port rpc project_id midonet provider_router_id midonet -provider_vlan_aiuto_create cisco +provider_vlan_auto_create cisco provider_vlan_auto_trunk cisco provider_vlan_name_prefix cisco publish_errors logging @@ -201,7 +201,7 @@ report_interval agent req_timeout ml2 request_timeout mlnx retries nicira -retry_intervali db +retry_interval db retry_until_window wsgi ringfile rpc root_helper common @@ -265,7 +265,10 @@ username brocade username midonet username plumgrid verbose logging +veth_mtu openvswitch vif_type bigswitch +vif_types bigswitch vlan_name_prefix cisco +vni_ranges ml2 vnic_type mlnx vswitch_plugin cisco diff --git a/autogenerate-config-docs/flagmappings/nova.flagmappings b/autogenerate-config-docs/flagmappings/nova.flagmappings index ad7a32ab..e4a89248 100644 --- a/autogenerate-config-docs/flagmappings/nova.flagmappings +++ b/autogenerate-config-docs/flagmappings/nova.flagmappings @@ -11,6 +11,7 @@ allowed_direct_url_schemes glance allowed_rpc_exception_modules testing api_paste_config wsgi api_rate_limit authentication +api_retry_count vmware attestation_api_url trustedcomputing attestation_auth_blob trustedcomputing attestation_auth_timeout trustedcomputing @@ -20,6 +21,7 @@ attestation_server_ca_file trustedcomputing auth_strategy authentication auto_assign_floating_ip network backdoor_port testing +backend db bandwidth_poll_interval quota bandwidth_update_interval quota base_dir_name compute @@ -38,6 +40,7 @@ cell_type cells cells upgrade_levels cells_config cells cert upgrade_levels +cert_file ca cert_manager ca cert_topic ca checksum_base_images hypervisor @@ -48,6 +51,7 @@ cinder_catalog_info volumes cinder_cross_az_attach volumes cinder_endpoint_template volumes cinder_http_retries volumes +cluster_name vmware cnt_vpn_clients network compute upgrade_levels compute_api_class compute @@ -61,8 +65,11 @@ config_drive_format configdrive config_drive_inject_password configdrive config_drive_skip_versions configdrive config_drive_tempdir configdrive +connection_trace db console upgrade_levels +connection db console_driver xen +connection_debug db console_host compute console_manager compute console_public_hostname console @@ -86,7 +93,6 @@ db_backend baremetal db_backend db db_check_interval db db_driver db -dbapi_use_tpool db debug logging default_access_ip_network_name network default_availability_zone availabilityzones @@ -142,6 +148,7 @@ fake_network testing fake_rabbit testing fatal_deprecations logging fatal_exception_format_errors logging +filesystems glance firewall_driver network fixed_ip_disassociate_timeout network fixed_range network @@ -170,15 +177,20 @@ glusterfs_mount_point_base volumes heal_instance_info_cache_interval compute host common host redis +host_ip vmware host_state_interval compute +host_username vmware html5proxy_base_url spice +idle_timeout db image_cache_manager_interval compute +host_password vmware image_decryption_dir s3 image_info_filename_pattern compute inject_password hypervisor injected_network_template network injected_network_template network instance_build_timeout compute +instance_delete_interval compute instance_dns_domain network instance_dns_manager network instance_format logging @@ -273,13 +285,19 @@ max_hop_count cells max_instances_per_host scheduling max_io_ops_per_host scheduling max_kernel_ramdisk_size xen +max_pool_size db memcached_servers common +max_overflow db metadata_host metadata +max_retries db metadata_listen metadata +maximum_objects vmware metadata_listen_port metadata +maximum_instance_delete_attempts compute metadata_manager metadata metadata_port metadata metadata_workers metadata +min_pool_size db mkisofs_cmd configdrive monkey_patch testing monkey_patch_modules testing @@ -306,6 +324,7 @@ neutron_admin_tenant_name neutron neutron_admin_username neutron neutron_api_insecure neutron neutron_auth_strategy neutron +neutron_ca_certificates_file neutron neutron_default_tenant_id neutron neutron_extension_sync_interval neutron neutron_metadata_proxy_shared_secret neutron @@ -343,6 +362,7 @@ periodic_enable periodic periodic_fuzzy_delay periodic policy_default_rule policy policy_file policy +pool_timeout db port redis power_manager baremetal powervm_img_local_path powervm @@ -418,6 +438,7 @@ reserved_host_disk_mb scheduling reserved_host_memory_mb scheduling resize_confirm_window compute resume_guests_state_on_host_boot compute +retry_interval db ringfile rpc rootwrap_config common routing_source_ip network @@ -475,18 +496,11 @@ sg_retry_interval zookeeper share_dhcp_address network shelved_offload_time compute shelved_poll_interval compute +slave_connection db snapshot_image_format hypervisor snapshot_name_template api sql_connection baremetal sql_connection db -sql_connection_debug db -sql_connection_trace db -sql_idle_timeout db -sql_max_overflow db -sql_max_pool_size db -sql_max_retries db -sql_min_pool_size db -sql_retry_interval db sqlite_db db sqlite_synchronous db sr_matching_filter xen @@ -499,6 +513,7 @@ sync_power_state_interval compute syslog_log_facility logging target_host xen target_port xen +task_poll_interval vmware tcp_keepidle wsgi teardown_unused_network_gateway network tempdir common @@ -530,11 +545,14 @@ use_project_ca ca use_single_default_gateway network use_stderr logging use_syslog logging +use_tpool api use_unsafe_iscsi baremetal use_usb_tablet hypervisor user_cert_subject ca vcpu_pin_set hypervisor +vendordata_driver metadata verbose logging +vendordata_jsonfile_path metadata vif_driver baremetal virt_mkfs hypervisor virtual_power_host_key baremetal @@ -545,14 +563,6 @@ virtual_power_ssh_port baremetal virtual_power_type baremetal vlan_interface network vlan_start network -vmwareapi_api_retry_count vmware -vmwareapi_cluster_name vmware -vmwareapi_host_ip vmware -vmwareapi_host_password vmware -vmwareapi_host_username vmware -vmwareapi_task_poll_interval vmware -vmwareapi_vlan_interface vmware -vmwareapi_wsdl_loc vmware vnc_enabled vnc vnc_keymap vnc vnc_password vnc @@ -571,6 +581,7 @@ vpn_ip vpn vpn_key_suffix vpn vpn_start vpn vswitch_name hyperv +wsdl_location vmware wsgi_log_format wsgi xen_hvmloader_path xen xenapi_agent_path xen