Update conf option tables for cinder

This re-runs the autodoc tool to generate new flagmappings for
cinder from the recent trunk. It starts to separate out
the 'storage' category into various driver components.

Change-Id: Iaa8770001fcb182403ce9f1b756d4732d06bc3f6

autogenerate-config-docs/flagmappings/cinder.flagmappings

@@ -3,10 +3,11 @@ allowed_rpc_exception_modules rpc
 amqp_auto_delete rpc
 amqp_durable_queues rpc
 amqp_rpc_single_reply_queue rpc
+api_class keymgr
 api_paste_config api
 api_rate_limit api
 auth_strategy auth
-available_devices storage
+available_devices block-device
 backdoor_port api
 backend storage
 backlog log
@@ -17,7 +18,7 @@ backup_ceph_pool backups_ceph
 backup_ceph_stripe_count backups_ceph
 backup_ceph_stripe_unit backups_ceph
 backup_ceph_user backups_ceph
-backup_compression_algorithm backups_swift
+backup_compression_algorithm backups
 backup_driver backups
 backup_manager backups
 backup_name_template backups
@@ -35,7 +36,7 @@ backup_tsm_password backups_tsm
 backup_tsm_volume_prefix backups_tsm
 bindir storage
 capacity_weight_multiplier storage
-cinder_huawei_conf_file storage
+cinder_huawei_conf_file huawei
 cloned_volume_same_az zones
 compute_api_class common
 connection connection
@@ -44,10 +45,10 @@ connection_trace connection
 connection_type connection
 control_exchange rpc
 coraid_esm_address storage
-coraid_group storage
-coraid_password storage
-coraid_repository_key storage
-coraid_user storage
+coraid_group coraid
+coraid_password coraid
+coraid_repository_key coraid
+coraid_user coraid
 db_backend database
 db_driver database
 debug common
@@ -57,21 +58,22 @@ default_notification_level common
 default_publisher_id common
 default_volume_type common
 disable_process_locking common
+enabled_backends storage
 enable_new_services common
 enable_v1_api api
 enable_v2_api api
-enabled_backends storage
-eqlx_chap_login storage
-eqlx_chap_password storage
-eqlx_cli_max_retries storage
-eqlx_cli_timeout storage
-eqlx_group_name storage
-eqlx_pool storage
-eqlx_use_chap storage
-expiry_thres_minutes storage
+eqlx_chap_login eqlx
+eqlx_chap_password eqlx
+eqlx_cli_max_retries eqlx
+eqlx_cli_timeout eqlx
+eqlx_group_name eqlx
+eqlx_pool eqlx
+eqlx_use_chap eqlx
+expiry_thres_minutes netapp
 fake_rabbit rpc
 fatal_deprecations common
 fatal_exception_format_errors common
+fixed_key keymgr
 glance_api_insecure images
 glance_api_servers images
 glance_api_ssl_compression images
@@ -85,24 +87,24 @@ glusterfs_mount_point_base storage_glusterfs
 glusterfs_qcow2_volumes storage_glusterfs
 glusterfs_shares_config storage_glusterfs
 glusterfs_sparsed_volumes storage_glusterfs
-gpfs_images_dir gpfs_volume
-gpfs_images_share_mode gpfs_volume
-gpfs_max_clone_depth gpfs_volume
-gpfs_mount_point_base gpfs_volume
-gpfs_sparse_volumes gpfs_volume
-hds_cinder_config_file storage
+gpfs_images_dir storage_gpfs
+gpfs_images_share_mode storage_gpfs
+gpfs_max_clone_depth storage_gpfs
+gpfs_mount_point_base storage_gpfs
+gpfs_sparse_volumes storage_gpfs
+hds_cinder_config_file hds
 host common
 host common
-hp3par_api_url storage
-hp3par_cpg storage
-hp3par_cpg_snap storage
-hp3par_debug storage
-hp3par_domain storage
-hp3par_iscsi_ips storage
-hp3par_password storage
-hp3par_snapshot_expiration storage
-hp3par_snapshot_retention storage
-hp3par_username storage
+hp3par_api_url hp3par
+hp3par_cpg hp3par
+hp3par_cpg_snap hp3par
+hp3par_debug hp3par
+hp3par_domain hp3par
+hp3par_iscsi_ips hp3par
+hp3par_password hp3par
+hp3par_snapshot_expiration hp3par
+hp3par_snapshot_retention hp3par
+hp3par_username hp3par
 idle_timeout common
 iet_conf common
 image_conversion_dir images
@@ -119,7 +121,6 @@ iser_ip_address storage
 iser_num_targets storage
 iser_port storage
 iser_target_prefix storage
-keymgr_api_class storage
 kombu_ssl_ca_certs rpc
 kombu_ssl_certfile rpc
 kombu_ssl_keyfile rpc
@@ -135,12 +136,12 @@ logging_context_format_string common
 logging_debug_format_suffix common
 logging_default_format_string common
 logging_exception_prefix common
-lvm_mirrors storage
-lvm_type storage
+lvm_mirrors lvm
+lvm_type lvm
 matchmaker_heartbeat_freq rpc
 matchmaker_heartbeat_ttl rpc
 matchmaker_ringfile rpc
-max_age storage
+max_age quota
 max_gigabytes storage
 max_overflow storage
 max_pool_size storage
@@ -151,35 +152,35 @@ min_pool_size storage
 monkey_patch common
 monkey_patch_modules common
 my_ip common
-netapp_login storage_netapp
-netapp_password storage
-netapp_server_hostname storage
-netapp_server_port storage
-netapp_size_multiplier storage
-netapp_storage_family storage
-netapp_storage_protocol storage
-netapp_transport_type storage
-netapp_vfiler storage_netapp
-netapp_volume_list storage
-netapp_vserver storage
-nexenta_blocksize storage_nexenta_iscsi
-nexenta_host storage_nexenta_iscsi
-nexenta_iscsi_target_portal_port storage_nexenta_iscsi
-nexenta_mount_options storage_nexenta_nfs
-nexenta_mount_point_base storage_nexenta_nfs
-nexenta_oversub_ratio storage_nexenta_nfs
-nexenta_password storage_nexenta_iscsi
-nexenta_rest_port storage_nexenta_iscsi
-nexenta_rest_protocol storage_nexenta_iscsi
-nexenta_shares_config storage_nexenta_nfs
-nexenta_sparse storage_nexenta_iscsi
-nexenta_sparsed_volumes storage_nexenta_nfs
-nexenta_target_group_prefix storage_nexenta_iscsi
-nexenta_target_prefix storage_nexenta_iscsi
-nexenta_used_ratio storage_nexenta_nfs
-nexenta_user storage_nexenta_iscsi
-nexenta_volume storage_nexenta_iscsi
-nexenta_volume_compression storage_nexenta_nfs
+netapp_login netapp
+netapp_password netapp
+netapp_server_hostname netapp
+netapp_server_port netapp
+netapp_size_multiplier netapp
+netapp_storage_family netapp
+netapp_storage_protocol netapp
+netapp_transport_type netapp
+netapp_vfiler netapp
+netapp_volume_list netapp
+netapp_vserver netapp
+nexenta_blocksize nexenta_iscsi
+nexenta_host nexenta_iscsi
+nexenta_iscsi_target_portal_port nexenta_iscsi
+nexenta_mount_options nexenta_nfs
+nexenta_mount_point_base nexenta_nfs
+nexenta_oversub_ratio nexenta_nfs
+nexenta_password nexenta_iscsi
+nexenta_rest_port nexenta_iscsi
+nexenta_rest_protocol nexenta_iscsi
+nexenta_shares_config nexenta_nfs
+nexenta_sparsed_volumes nexenta_iscsi
+nexenta_sparse nexenta_iscsi
+nexenta_target_group_prefix nexenta_iscsi
+nexenta_target_prefix nexenta_iscsi
+nexenta_used_ratio nexenta_nfs
+nexenta_user nexenta_iscsi
+nexenta_volume_compression nexenta_nfs
+nexenta_volume nexenta_iscsi
 nfs_mount_options storage_nfs
 nfs_mount_point_base storage_nfs
 nfs_oversub_ratio storage_nfs
@@ -189,25 +190,25 @@ nfs_used_ratio storage_nfs
 no_snapshot_gb_quota common
 notification_driver rpc
 notification_topics rpc
-nova_api_insecure common
-nova_ca_certificates_file common
-nova_catalog_admin_info common
-nova_catalog_info common
-nova_endpoint_admin_template common
-nova_endpoint_template common
+nova_api_insecure compute
+nova_ca_certificates_file compute
+nova_catalog_admin_info compute
+nova_catalog_info compute
+nova_endpoint_admin_template compute
+nova_endpoint_template compute
 num_iser_scan_tries storage
 num_shell_tries common
 num_volume_device_scan_tries storage
-os_region_name common
 osapi_max_limit api
 osapi_max_request_body_size api
 osapi_volume_base_URL api
-osapi_volume_ext_list api
 osapi_volume_extension api
+osapi_volume_ext_list api
+os_region_name compute
 password common
 policy_default_rule common
 policy_file common
-pool_size common
+pool_size lvm
 port common
 publish_errors rpc
 pybasedir common
@@ -221,10 +222,10 @@ qpid_sasl_mechanisms rpc
 qpid_tcp_nodelay rpc
 qpid_topology_version rpc
 qpid_username rpc
-quota_driver common
-quota_gigabytes common
-quota_snapshots common
-quota_volumes common
+quota_driver quota
+quota_gigabytes quota
+quota_snapshots quota
+quota_volumes quota
 rabbit_ha_queues rpc
 rabbit_host rpc
 rabbit_hosts rpc
@@ -233,8 +234,8 @@ rabbit_password rpc
 rabbit_port rpc
 rabbit_retry_backoff rpc
 rabbit_retry_interval rpc
-rabbit_use_ssl rpc
 rabbit_userid rpc
+rabbit_use_ssl rpc
 rabbit_virtual_host rpc
 rbd_ceph_conf storage_ceph
 rbd_flatten_volume_from_snapshot storage_ceph
@@ -242,9 +243,9 @@ rbd_max_clone_depth storage_ceph
 rbd_pool storage_ceph
 rbd_secret_uuid storage_ceph
 rbd_user storage_ceph
-reservation_expire common
+reservation_expire quota
 reserved_percentage common
-restore_discard_excess_bytes backups
+restore_discard_excess_bytes backups_ceph
 retry_interval common
 root_helper common
 rootwrap_config common
@@ -261,18 +262,18 @@ rpc_zmq_matchmaker rpc
 rpc_zmq_port rpc
 rpc_zmq_topic_backlog rpc
 run_external_periodic_tasks common
-san_clustername storage
-san_ip storage
-san_is_local storage
-san_login storage
-san_password storage
-san_private_key storage
-san_ssh_port storage
-san_thin_provision storage
-san_zfs_volume_base storage
-scality_sofs_config storage
-scality_sofs_mount_point storage
-scality_sofs_volume_dir storage
+san_clustername san
+san_ip san
+san_is_local san
+san_login san
+san_password san
+san_private_key san
+san_ssh_port san
+san_thin_provision san
+san_zfs_volume_base san-solaris
+scality_sofs_config scality
+scality_sofs_mount_point scality
+scality_sofs_volume_dir scality
 scheduler_default_filters scheduler
 scheduler_default_weighers scheduler
 scheduler_driver scheduler
@@ -282,42 +283,43 @@ scheduler_manager scheduler
 scheduler_max_attempts scheduler
 scheduler_topic scheduler
 service_down_time common
-sf_account_prefix storage
-sf_allow_tenant_qos storage
-sf_api_port storage
-sf_emulate_512 storage
-snapshot_name_template backup
-snapshot_same_host backup
+sf_account_prefix solidfire
+sf_allow_tenant_qos solidfire
+sf_api_port solidfire
+sf_emulate_512 solidfire
+snapshot_name_template backups
+snapshot_same_host backups
 sqlite_db common
 sqlite_synchronous common
-ssh_conn_timeout common
-ssh_max_pool_conn common
-ssh_min_pool_conn common
+ssh_conn_timeout san
+ssh_max_pool_conn san
+ssh_min_pool_conn san
 ssl_ca_file common
 ssl_cert_file common
 ssl_key_file common
 state_path common
 storage_availability_zone common
-storwize_svc_connection_protocol storage
-storwize_svc_flashcopy_timeout storage
-storwize_svc_multihostmap_enabled storage
-storwize_svc_multipath_enabled storage
-storwize_svc_vol_autoexpand storage
-storwize_svc_vol_compression storage
-storwize_svc_vol_easytier storage
-storwize_svc_vol_grainsize storage
-storwize_svc_vol_iogrp storage
-storwize_svc_vol_rsize storage
-storwize_svc_vol_warning storage
-storwize_svc_volpool_name storage
+storwize_svc_connection_protocol storwize
+storwize_svc_flashcopy_timeout storwize
+storwize_svc_iscsi_chap_enabled storwize
+storwize_svc_multihostmap_enabled storwize
+storwize_svc_multipath_enabled storwize
+storwize_svc_vol_autoexpand storwize
+storwize_svc_vol_compression storwize
+storwize_svc_vol_easytier storwize
+storwize_svc_vol_grainsize storwize
+storwize_svc_vol_iogrp storwize
+storwize_svc_volpool_name storwize
+storwize_svc_vol_rsize storwize
+storwize_svc_vol_warning storwize
 syslog_log_facility common
 tcp_keepidle common
-thres_avl_size_perc_start storage
-thres_avl_size_perc_stop storage
+thres_avl_size_perc_start netapp
+thres_avl_size_perc_stop netapp
 topics common
 transfer_api_class api
 until_refresh common
-use_default_quota_class common
+use_default_quota_class quota
 use_forwarded_for common
 use_multipath_for_image_xfer images
 use_stderr common
@@ -326,38 +328,38 @@ use_tpool common
 verbose common
 volume_api_class api
 volume_backend_name storage
-volume_clear storage
 volume_clear_size storage
+volume_clear storage
 volume_dd_blocksize storage
 volume_driver storage
-volume_group storage
+volume_group lvm
 volume_manager storage
-volume_name_template storage
-volume_tmp_dir storage_ceph
-volume_topic storage
-volume_transfer_key_length storage
-volume_transfer_salt_length storage
-volume_usage_audit_period storage
+volume_name_template api
 volumes_dir storage
-windows_iscsi_lun_path storage
+volume_tmp_dir storage_ceph
+volume_topic rpc
+volume_transfer_key_length api
+volume_transfer_salt_length api
+volume_usage_audit_period storage
+windows_iscsi_lun_path windows
 xenapi_connection_password storage_xen
 xenapi_connection_url storage_xen
 xenapi_connection_username storage_xen
 xenapi_nfs_server storage_xen
 xenapi_nfs_serverpath storage_xen
 xenapi_sr_base_path storage_xen
-xiv_ds8k_connection_type storage
-xiv_ds8k_proxy storage
+xiv_ds8k_connection_type xiv
+xiv_ds8k_proxy xiv
 zadara_default_stripesize storage
-zadara_default_striping_mode storage
-zadara_password storage
-zadara_user storage
-zadara_vol_encrypt storage
-zadara_vol_name_template storage
-zadara_vol_thin storage
-zadara_vpsa_allow_nonexistent_delete storage
-zadara_vpsa_auto_detach_on_delete storage
-zadara_vpsa_ip storage
-zadara_vpsa_poolname storage
-zadara_vpsa_port storage
-zadara_vpsa_use_ssl storage
+zadara_default_striping_mode zadara
+zadara_password zadara
+zadara_user zadara
+zadara_vol_encrypt zadara
+zadara_vol_name_template zadara
+zadara_vol_thin zadara
+zadara_vpsa_allow_nonexistent_delete zadara
+zadara_vpsa_auto_detach_on_delete zadara
+zadara_vpsa_ip zadara
+zadara_vpsa_poolname zadara
+zadara_vpsa_port zadara
+zadara_vpsa_use_ssl zadara