Merge "[Manila] Add config ref for the Generic driver"

This commit is contained in:
Jenkins 2015-11-27 16:45:38 +00:00 committed by Gerrit Code Review
commit 7ac12dffbc
7 changed files with 256 additions and 242 deletions

View File

@ -0,0 +1,208 @@
<?xml version='1.0' encoding='UTF-8'?>
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<!--
###################################################################
WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
###################################################################
Warning: Do not edit this file. It is automatically
generated from the software project's code and your changes
will be overwritten.
The tool to generate this file lives in openstack-doc-tools
repository.
Please make any changes needed in the code, then run the
autogenerate-config-doc tool from the openstack-doc-tools
repository, or ask for help on the documentation mailing list,
IRC channel or meeting.
###################################################################
WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
###################################################################
-->
<table rules="all" xml:id="config_table_manila_generic">
<caption>Description of Generic Share Driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
<tr>
<th>Configuration option = Default value</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td><option>cinder_admin_auth_url</option> = <replaceable>http://localhost:5000/v2.0</replaceable></td>
<td>(StrOpt) Identity service URL.</td>
</tr>
<tr>
<td><option>cinder_admin_password</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Cinder admin password.</td>
</tr>
<tr>
<td><option>cinder_admin_tenant_name</option> = <replaceable>service</replaceable></td>
<td>(StrOpt) Cinder admin tenant name.</td>
</tr>
<tr>
<td><option>cinder_admin_username</option> = <replaceable>cinder</replaceable></td>
<td>(StrOpt) Cinder admin username.</td>
</tr>
<tr>
<td><option>cinder_api_insecure</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Allow to perform insecure SSL requests to cinder.</td>
</tr>
<tr>
<td><option>cinder_ca_certificates_file</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Location of CA certificates file to use for cinder client requests.</td>
</tr>
<tr>
<td><option>cinder_catalog_info</option> = <replaceable>volume:cinder:publicURL</replaceable></td>
<td>(StrOpt) Info to match when looking for cinder in the service catalog. Format is separated values of the form: &lt;service_type&gt;:&lt;service_name&gt;:&lt;endpoint_type&gt;</td>
</tr>
<tr>
<td><option>cinder_cross_az_attach</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) Allow attaching between instances and volumes in different availability zones.</td>
</tr>
<tr>
<td><option>cinder_http_retries</option> = <replaceable>3</replaceable></td>
<td>(IntOpt) Number of cinderclient retries on failed HTTP calls.</td>
</tr>
<tr>
<td><option>cinder_volume_type</option> = <replaceable>%volume_type%</replaceable></td>
<td>(StrOpt) Name or id of the Cinder volume type which will be used for all volumes created by driver.</td>
</tr>
<tr>
<td><option>connect_share_server_to_tenant_network</option> = <replaceable>False/True</replaceable></td>
<td>(BoolOpt) Attach share server directly to share network. Used only with Neutron and only applies when the option driver_handles_share_servers is set to True and one of either Generic or Windows drivers is used.</td>
</tr>
<tr>
<td><option>driver_handles_share_servers</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Required option that defines driver mode. Possible values are True/False.</td>
</tr>
<tr>
<td><option>interface_driver</option> = <replaceable>manila.network.linux.interface.OVSInterfaceDriver</replaceable></td>
<td>(StrOpt) Vif driver. Used only with Neutron and only applies when the option driver_handles_share_servers is set to True.</td>
</tr>
<tr>
<td><option>manila_service_keypair_name</option> = <replaceable>manila-service</replaceable></td>
<td>(StrOpt) Keypair name that will be created and used for service instances. This option only applies when the option driver_handles_share_servers is set to True.</td>
</tr>
<tr>
<td><option>max_time_to_attach</option> = <replaceable>120</replaceable></td>
<td>(IntOpt) Maximum time to wait for attachment of a Cinder volume.</td>
</tr>
<tr>
<td><option>max_time_to_build_instance</option> = <replaceable>300</replaceable></td>
<td>(IntOpt) Maximum time in seconds to wait for creating service instance. This option only applies when the option driver_handles_share_servers is set to True.</td>
</tr>
<tr>
<td><option>max_time_to_create_volume</option> = <replaceable>180</replaceable></td>
<td>(IntOpt) Maximum time to wait for creation of a Cinder volume.</td>
</tr>
<tr>
<td><option>max_time_to_extend_volume</option> = <replaceable>180</replaceable></td>
<td>(IntOpt) Maximum time to wait for extention of a Cinder volume.</td>
</tr>
<tr>
<td><option>ovs_integration_bridge</option> = <replaceable>br-int</replaceable></td>
<td>(StrOpt) Name of Open vSwitch bridge to use.</td>
</tr>
<tr>
<td><option>path_to_private_key</option> = <replaceable>~/.ssh/id_rsa</replaceable></td>
<td>(StrOpt) Path to host's private key.</td>
</tr>
<tr>
<td><option>path_to_public_key</option> = <replaceable>~/.ssh/id_rsa.pub</replaceable></td>
<td>(StrOpt) Path to hosts public key. This option only applies when the option driver_handles_share_servers is set to True.</td>
</tr>
<tr>
<td><option>service_image_name</option> = <replaceable>manila-service-image</replaceable></td>
<td>(StrOpt) Name of image in Glance, that will be used for service instance creation. This option only applies when the option driver_handles_share_servers is set to True.</td>
</tr>
<tr>
<td><option>service_instance_flavor_id</option> = <replaceable>100</replaceable></td>
<td>(IntOpt) ID of flavor, that will be used for service instance creation. This option only applies when the option driver_handles_share_servers is set to True.</td>
</tr>
<tr>
<td><option>service_instance_name_or_id</option> = <replaceable>%nova_vm_name_or_id%</replaceable></td>
<td>(StrOpt) Name or ID of service instance in Nova to use for share exports. Used only when share servers handling is disabled. This option only applies when the option driver_handles_share_servers is set to False.</td>
</tr>
<tr>
<td><option>service_instance_name_template</option> = <replaceable>manila_service_instance_%s</replaceable></td>
<td>(StrOpt) Template that will be used for naming of Nova VMs that are used and service instances. This option only applies when the option driver_handles_share_servers is set to True.</td>
</tr>
<tr>
<td><option>service_instance_network_helper_type</option> = <replaceable>neutron</replaceable></td>
<td>(StrOpt) Type of network helper for the Generic driver. Possible values are 'neutron' and 'nova'. This option only applies when the option driver_handles_share_servers is set to True.</td>
</tr>
<tr>
<td><option>service_instance_password</option> = <replaceable>%password%</replaceable></td>
<td>(StrOpt) Password for service instance user. Optional, will be used in ase SSH keys are not set up.</td>
</tr>
<tr>
<td><option>service_instance_security_group</option> = <replaceable>manila-service</replaceable></td>
<td>(StrOpt) Security group name, that will be used for service instance creation. This option only applies when the option driver_handles_share_servers is set to True.</td>
</tr>
<tr>
<td><option>service_instance_smb_config_path</option> = <replaceable>$share_mount_path/smb.conf</replaceable></td>
<td>(StrOpt) Path to SMB config in service instance.</td>
</tr>
<tr>
<td><option>service_instance_user</option> = <replaceable>%username%</replaceable></td>
<td>(StrOpt) User in service instance that will be used for authentication.</td>
</tr>
<tr>
<td><option>service_net_name_or_ip</option> = <replaceable>%nova_vm_net_name_or_ip%</replaceable></td>
<td>(StrOpt) Can be either name of network that is used by service instance within Nova to get IP address or IP address itself for managing shares there. This option only applies when the option driver_handles_share_servers is set to False.</td>
</tr>
<tr>
<td><option>service_network_cidr</option> = <replaceable>10.254.0.0/16</replaceable></td>
<td>(StrOpt) CIDR of manila service network. Used only with Neutron and only applies when the option driver_handles_share_servers is set to True.</td>
</tr>
<tr>
<td><option>service_network_division_mask</option> = <replaceable>28</replaceable></td>
<td>(IntOpt) This mask is used for dividing service network into subnets, IP capacity of subnet with this mask directly defines possible amount of created service VMs per tenant's subnet. Used only with Neutron and only applies when the option driver_handles_share_servers is set to True.</td>
</tr>
<tr>
<td><option>service_network_name</option> = <replaceable>manila_service_network</replaceable></td>
<td>(StrOpt) Name of manila service network. Used only with Neutron and only applies when the option driver_handles_share_servers is set to True.</td>
</tr>
<tr>
<td><option>share_backend_name</option> = <replaceable>Cinder_Volumes</replaceable></td>
<td>(StrOpt) The backend name for the Generic driver.</td>
</tr>
<tr>
<td><option>share_driver</option> = <replaceable>manila.share.drivers.generic.GenericShareDriver</replaceable></td>
<td>(StrOpt) path to Generic driver.</td>
</tr>
<tr>
<td><option>share_helpers</option> = <replaceable>CIFS=manila.share.drivers.generic.CIFSHelper,NFS=manila.share.drivers.generic.NFSHelper</replaceable></td>
<td>(ListOpt) List of share export helpers.</td>
</tr>
<tr>
<td><option>share_mount_path</option> = <replaceable>/shares</replaceable></td>
<td>(StrOpt) Parent path in service instance where shares will be mounted.</td>
</tr>
<tr>
<td><option>share_volume_fstype</option> = <replaceable>ext4</replaceable></td>
<td>(StrOpt) Filesystem type of the share volume. Possible values are 'ext4' and 'ext3'</td>
</tr>
<tr>
<td><option>tenant_net_name_or_ip</option> = <replaceable>%nova_vm_tenant_net_name_or_ip%</replaceable></td>
<td>(StrOpt) Can be either name of network that is used by service instance within Nova to get IP address or IP address itself for exporting shares. This option only applies when the option driver_handles_share_servers is set to False.</td>
</tr>
<tr>
<td><option>volume_name_template</option> = <replaceable>manila-share-%s</replaceable></td>
<td>(StrOpt) Name template for Cinder volumes.</td>
</tr>
<tr>
<td><option>volume_snapshot_name_template</option> = <replaceable>manila-snapshot-%s</replaceable></td>
<td>(StrOpt) Name template for Cinder snapshots..</td>
</tr>
</tbody>
</table>
</para>

View File

@ -43,10 +43,6 @@
<td><option>backlog</option> = <replaceable>4096</replaceable></td>
<td>(IntOpt) Number of backlog requests to configure the socket with.</td>
</tr>
<tr>
<td><option>connect_share_server_to_tenant_network</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Attach share server directly to share network. Used only with Neutron.</td>
</tr>
<tr>
<td><option>default_share_type</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Default share type to use.</td>
@ -87,30 +83,6 @@
<td><option>hook_drivers</option> = <replaceable></replaceable></td>
<td>(ListOpt) Driver(s) to perform some additional actions before and after share driver actions and on a periodic basis. Default is [].</td>
</tr>
<tr>
<td><option>interface_driver</option> = <replaceable>manila.network.linux.interface.OVSInterfaceDriver</replaceable></td>
<td>(StrOpt) Vif driver. Used only with Neutron.</td>
</tr>
<tr>
<td><option>manila_service_keypair_name</option> = <replaceable>manila-service</replaceable></td>
<td>(StrOpt) Keypair name that will be created and used for service instances.</td>
</tr>
<tr>
<td><option>max_time_to_attach</option> = <replaceable>120</replaceable></td>
<td>(IntOpt) Maximum time to wait for attaching cinder volume.</td>
</tr>
<tr>
<td><option>max_time_to_build_instance</option> = <replaceable>300</replaceable></td>
<td>(IntOpt) Maximum time in seconds to wait for creating service instance.</td>
</tr>
<tr>
<td><option>max_time_to_create_volume</option> = <replaceable>180</replaceable></td>
<td>(IntOpt) Maximum time to wait for creating cinder volume.</td>
</tr>
<tr>
<td><option>max_time_to_extend_volume</option> = <replaceable>180</replaceable></td>
<td>(IntOpt) Maximum time to wait for extending cinder volume.</td>
</tr>
<tr>
<td><option>migration_create_delete_share_timeout</option> = <replaceable>300</replaceable></td>
<td>(IntOpt) Timeout for creating and deleting share instances when performing share migration (seconds).</td>
@ -147,74 +119,10 @@
<td><option>network_config_group</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Name of the configuration group in the Manila conf file to look for network config options.If not set, the share backend's config group will be used.If an option is not found within provided group, then'DEFAULT' group will be used for search of option.</td>
</tr>
<tr>
<td><option>ovs_integration_bridge</option> = <replaceable>br-int</replaceable></td>
<td>(StrOpt) Name of Open vSwitch bridge to use.</td>
</tr>
<tr>
<td><option>path_to_private_key</option> = <replaceable>~/.ssh/id_rsa</replaceable></td>
<td>(StrOpt) Path to host's private key.</td>
</tr>
<tr>
<td><option>path_to_public_key</option> = <replaceable>~/.ssh/id_rsa.pub</replaceable></td>
<td>(StrOpt) Path to hosts public key.</td>
</tr>
<tr>
<td><option>root_helper</option> = <replaceable>sudo</replaceable></td>
<td>(StrOpt) Deprecated: command to use for running commands as root.</td>
</tr>
<tr>
<td><option>service_image_name</option> = <replaceable>manila-service-image</replaceable></td>
<td>(StrOpt) Name of image in Glance, that will be used for service instance creation.</td>
</tr>
<tr>
<td><option>service_instance_flavor_id</option> = <replaceable>100</replaceable></td>
<td>(IntOpt) ID of flavor, that will be used for service instance creation.</td>
</tr>
<tr>
<td><option>service_instance_name_or_id</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Name or ID of service instance in Nova to use for share exports. Used only when share servers handling is disabled.</td>
</tr>
<tr>
<td><option>service_instance_name_template</option> = <replaceable>manila_service_instance_%s</replaceable></td>
<td>(StrOpt) Name of service instance.</td>
</tr>
<tr>
<td><option>service_instance_network_helper_type</option> = <replaceable>neutron</replaceable></td>
<td>(StrOpt) Allowed values are ['nova', 'neutron'].</td>
</tr>
<tr>
<td><option>service_instance_password</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Password for service instance user.</td>
</tr>
<tr>
<td><option>service_instance_security_group</option> = <replaceable>manila-service</replaceable></td>
<td>(StrOpt) Security group name, that will be used for service instance creation.</td>
</tr>
<tr>
<td><option>service_instance_smb_config_path</option> = <replaceable>$share_mount_path/smb.conf</replaceable></td>
<td>(StrOpt) Path to SMB config in service instance.</td>
</tr>
<tr>
<td><option>service_instance_user</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) User in service instance that will be used for authentication.</td>
</tr>
<tr>
<td><option>service_net_name_or_ip</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Can be either name of network that is used by service instance within Nova to get IP address or IP address itself for managing shares there. Used only when share servers handling is disabled.</td>
</tr>
<tr>
<td><option>service_network_cidr</option> = <replaceable>10.254.0.0/16</replaceable></td>
<td>(StrOpt) CIDR of manila service network. Used only with Neutron.</td>
</tr>
<tr>
<td><option>service_network_division_mask</option> = <replaceable>28</replaceable></td>
<td>(IntOpt) This mask is used for dividing service network into subnets, IP capacity of subnet with this mask directly defines possible amount of created service VMs per tenant's subnet. Used only with Neutron.</td>
</tr>
<tr>
<td><option>service_network_name</option> = <replaceable>manila_service_network</replaceable></td>
<td>(StrOpt) Name of manila service network. Used only with Neutron.</td>
</tr>
<tr>
<td><option>share_backend_name</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) The backend name for a given driver implementation.</td>
@ -223,18 +131,10 @@
<td><option>share_driver</option> = <replaceable>manila.share.drivers.generic.GenericShareDriver</replaceable></td>
<td>(StrOpt) Driver to use for share creation.</td>
</tr>
<tr>
<td><option>share_helpers</option> = <replaceable>CIFS=manila.share.drivers.generic.CIFSHelper, NFS=manila.share.drivers.generic.NFSHelper</replaceable></td>
<td>(ListOpt) Specify list of share export helpers.</td>
</tr>
<tr>
<td><option>share_manager</option> = <replaceable>manila.share.manager.ShareManager</replaceable></td>
<td>(StrOpt) Full class name for the share manager.</td>
</tr>
<tr>
<td><option>share_mount_path</option> = <replaceable>/shares</replaceable></td>
<td>(StrOpt) Parent path in service instance where shares will be mounted.</td>
</tr>
<tr>
<td><option>share_name_template</option> = <replaceable>share-%s</replaceable></td>
<td>(StrOpt) Template string to be used to generate share names.</td>
@ -247,14 +147,6 @@
<td><option>share_usage_audit_period</option> = <replaceable>month</replaceable></td>
<td>(StrOpt) Time period to generate share usages for. Time period must be hour, day, month or year.</td>
</tr>
<tr>
<td><option>share_volume_fstype</option> = <replaceable>ext4</replaceable></td>
<td>(StrOpt) Filesystem type of the share volume.</td>
</tr>
<tr>
<td><option>smb_template_config_path</option> = <replaceable>$state_path/smb.conf</replaceable></td>
<td>(StrOpt) Path to smb config.</td>
</tr>
<tr>
<td><option>suppress_post_hooks_errors</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Whether to suppress post hook errors (allow driver's results to pass through) or not.</td>
@ -263,10 +155,6 @@
<td><option>suppress_pre_hooks_errors</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Whether to suppress pre hook errors (allow driver perform actions) or not.</td>
</tr>
<tr>
<td><option>tenant_net_name_or_ip</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Can be either name of network that is used by service instance within Nova to get IP address or IP address itself for exporting shares. Used only when share servers handling is disabled.</td>
</tr>
<tr>
<td><option>unmanage_remove_access_rules</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) If set to True, then manila will deny access and remove all access rules on share unmanage.If set to False - nothing will be changed.</td>

View File

@ -1,84 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<!--
###################################################################
WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
###################################################################
Warning: Do not edit this file. It is automatically
generated from the software project's code and your changes
will be overwritten.
The tool to generate this file lives in openstack-doc-tools
repository.
Please make any changes needed in the code, then run the
autogenerate-config-doc tool from the openstack-doc-tools
repository, or ask for help on the documentation mailing list,
IRC channel or meeting.
###################################################################
WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
###################################################################
-->
<table rules="all" xml:id="config_table_manila_storage">
<caption>Description of Storage configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
<tr>
<th>Configuration option = Default value</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td><option>cinder_admin_auth_url</option> = <replaceable>http://localhost:5000/v2.0</replaceable></td>
<td>(StrOpt) Identity service URL.</td>
</tr>
<tr>
<td><option>cinder_admin_password</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Cinder admin password.</td>
</tr>
<tr>
<td><option>cinder_admin_tenant_name</option> = <replaceable>service</replaceable></td>
<td>(StrOpt) Cinder admin tenant name.</td>
</tr>
<tr>
<td><option>cinder_admin_username</option> = <replaceable>cinder</replaceable></td>
<td>(StrOpt) Cinder admin username.</td>
</tr>
<tr>
<td><option>cinder_api_insecure</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Allow to perform insecure SSL requests to cinder.</td>
</tr>
<tr>
<td><option>cinder_ca_certificates_file</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Location of CA certificates file to use for cinder client requests.</td>
</tr>
<tr>
<td><option>cinder_catalog_info</option> = <replaceable>volume:cinder:publicURL</replaceable></td>
<td>(StrOpt) Info to match when looking for cinder in the service catalog. Format is separated values of the form: &lt;service_type&gt;:&lt;service_name&gt;:&lt;endpoint_type&gt;</td>
</tr>
<tr>
<td><option>cinder_cross_az_attach</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) Allow attaching between instances and volumes in different availability zones.</td>
</tr>
<tr>
<td><option>cinder_http_retries</option> = <replaceable>3</replaceable></td>
<td>(IntOpt) Number of cinderclient retries on failed HTTP calls.</td>
</tr>
<tr>
<td><option>cinder_volume_type</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Name or id of cinder volume type which will be used for all volumes created by driver.</td>
</tr>
<tr>
<td><option>max_gigabytes</option> = <replaceable>10000</replaceable></td>
<td>(IntOpt) Maximum number of volume gigabytes to allow per host.</td>
</tr>
</tbody>
</table>
</para>

View File

@ -203,4 +203,9 @@
</listitem>
</itemizedlist>
</simplesect>
<simplesect>
<title>Driver options</title>
<para>The following table contains the configuration options specific to this driver.</para>
<xi:include href="../../../common/tables/manila-generic.xml"/>
</simplesect>
</section>

View File

@ -38,7 +38,6 @@
<xi:include href="../../common/tables/manila-san.xml"/>
<xi:include href="../../common/tables/manila-scheduler.xml"/>
<xi:include href="../../common/tables/manila-share.xml"/>
<xi:include href="../../common/tables/manila-storage.xml"/>
<xi:include href="../../common/tables/manila-winrm.xml"/>
<xi:include href="../../common/tables/manila-zeromq.xml"/>
<xi:include href="../../common/tables/manila-zfssa.xml"/>

View File

@ -4,19 +4,19 @@ auth_strategy auth
automatic_share_server_cleanup share
backlog share
capacity_weight_multiplier scheduler
cinder_admin_auth_url storage
cinder_admin_password storage
cinder_admin_tenant_name storage
cinder_admin_username storage
cinder_api_insecure storage
cinder_ca_certificates_file storage
cinder_catalog_info storage
cinder_cross_az_attach storage
cinder_http_retries storage
cinder_volume_type storage
cinder_admin_auth_url generic
cinder_admin_password generic
cinder_admin_tenant_name generic
cinder_admin_username generic
cinder_api_insecure generic
cinder_ca_certificates_file generic
cinder_catalog_info generic
cinder_cross_az_attach generic
cinder_http_retries generic
cinder_volume_type generic
client_socket_timeout common
compute_api_class common
connect_share_server_to_tenant_network share
connect_share_server_to_tenant_network generic
control_exchange amqp
db_backend database
db_driver database
@ -24,7 +24,7 @@ debug logging
default_log_levels logging
default_share_type share
delete_share_server_with_last_share share
driver_handles_share_servers share
driver_handles_share_servers share generic
emc_nas_login emc
emc_nas_password emc
emc_nas_pool_name emc
@ -102,7 +102,7 @@ hpe3par_share_ip_address hpe3par
hpe3par_username hpe3par
instance_format logging
instance_uuid_format logging
interface_driver share
interface_driver generic
knfs_export_options gpfs
log_config_append logging
log_date_format logging
@ -115,15 +115,14 @@ logging_default_format_string logging
logging_exception_prefix logging
logging_user_identity_format logging
manila_huawei_conf_file huawei
manila_service_keypair_name share
manila_service_keypair_name generic
max_age quota
max_gigabytes storage
max_header_line api
max_over_subscription_ratio common
max_time_to_attach share
max_time_to_build_instance share
max_time_to_create_volume share
max_time_to_extend_volume share
max_time_to_attach generic
max_time_to_build_instance generic
max_time_to_create_volume generic
max_time_to_extend_volume generic
memcached_servers common
migration_create_delete_share_timeout share
migration_data_copy_node_ip share
@ -172,10 +171,10 @@ osapi_share_extension api
osapi_share_listen api
osapi_share_listen_port api
osapi_share_workers api
ovs_integration_bridge share
ovs_integration_bridge generic
password redis
path_to_private_key share
path_to_public_key share
path_to_private_key generic
path_to_public_key generic
periodic_fuzzy_delay common
periodic_hooks_interval common
periodic_interval common
@ -226,31 +225,30 @@ scheduler_manager scheduler
scheduler_max_attempts scheduler
scheduler_topic scheduler
service_down_time common
service_image_name share
service_instance_flavor_id share
service_instance_name_or_id share
service_instance_name_template share
service_instance_network_helper_type share
service_instance_password share
service_instance_security_group share
service_instance_smb_config_path share
service_instance_user share
service_net_name_or_ip share
service_network_cidr share
service_network_division_mask share
service_network_name share
service_image_name generic
service_instance_flavor_id generic
service_instance_name_or_id generic
service_instance_name_template generic
service_instance_network_helper_type generic
service_instance_password generic
service_instance_security_group generic
service_instance_smb_config_path generic
service_instance_user generic
service_net_name_or_ip generic
service_network_cidr generic
service_network_division_mask generic
service_network_name generic
share_api_class api
share_backend_name share
share_driver share
share_helpers share
share_backend_name share generic
share_driver share generic
share_helpers generic
share_manager share
share_mount_path share
share_mount_path generic
share_name_template share
share_snapshot_name_template share
share_topic rpc
share_usage_audit_period share
share_volume_fstype share
smb_template_config_path share
share_volume_fstype generic
sql_idle_timeout common
sql_max_retries common
sql_retry_interval common
@ -272,7 +270,7 @@ tcp_keepalive common
tcp_keepalive_count common
tcp_keepalive_interval common
tcp_keepidle common
tenant_net_name_or_ip share
tenant_net_name_or_ip generic
transport_url amqp
unmanage_remove_access_rules share
until_refresh common
@ -284,8 +282,8 @@ use_syslog logging
use_syslog_rfc_format logging
verbose logging
volume_api_class api
volume_name_template api
volume_snapshot_name_template api
volume_name_template api generic
volume_snapshot_name_template api generic
watch_log_file logging
winrm_cert_key_pem_path winrm
winrm_cert_pem_path winrm

View File

@ -9,6 +9,7 @@ cors CORS
database Database
emc EMC Share Drivers
ganesha Ganesha
generic Generic Share Driver
glusterfs GlusterFS Share Drivers
gpfs IBM GPFS Share Driver
hdfs HDFS Share Driver
@ -26,7 +27,6 @@ rpc RPC
san SAN
scheduler Scheduler
share Share
storage Storage
winrm WinRM
zeromq ZeroMQ
zfssa ZFSSA Share Driver