Update cinder options for icehouse

Change-Id: If23fc120c239b2b4fbc4c7fc715b0ba3f9d817ea

doc/common/tables/cinder-api.xml

@@ -25,7 +25,7 @@
               </tr>
               <tr>
                        <td>backdoor_port = None</td>
-                       <td>(IntOpt) port for eventlet backdoor to listen</td>
+                       <td>(StrOpt) Enable eventlet backdoor.  Acceptable values are 0, &lt;port&gt;, and &lt;start&gt;:&lt;end&gt;, where 0 results in listening on a random tcp port number; &lt;port&gt; results in listening on the specified port number (and not enabling backdoor if that port is in use); and &lt;start&gt;:&lt;end&gt; results in listening on the smallest unused port number within the specified range of port numbers.  The chosen port is displayed in the service's log file.</td>
               </tr>
               <tr>
                        <td>enable_v1_api = True</td>
@@ -47,13 +47,21 @@
                        <td>osapi_volume_base_URL = None</td>
                        <td>(StrOpt) Base URL that will be presented to users in links to the OpenStack Volume API</td>
               </tr>
+              <tr>
+                       <td>osapi_volume_ext_list = </td>
+                       <td>(ListOpt) Specify list of extensions to load when using osapi_volume_extension option with cinder.api.contrib.select_extensions</td>
+              </tr>
               <tr>
                        <td>osapi_volume_extension = ['cinder.api.contrib.standard_extensions']</td>
                        <td>(MultiStrOpt) osapi volume extension to load</td>
               </tr>
               <tr>
-                       <td>osapi_volume_ext_list = </td>
+                       <td>osapi_volume_listen = 0.0.0.0</td>
-                       <td>(ListOpt) Specify list of extensions to load when using osapi_volume_extension option with cinder.api.contrib.select_extensions</td>
+                       <td>(StrOpt) IP address for OpenStack Volume API to listen</td>
+              </tr>
+              <tr>
+                       <td>osapi_volume_listen_port = 8776</td>
+                       <td>(IntOpt) port for os volume api to listen</td>
               </tr>
               <tr>
                        <td>transfer_api_class = cinder.transfer.api.API</td>

doc/common/tables/cinder-common.xml

@@ -28,7 +28,7 @@
                        <td>(StrOpt) default availability zone to use when creating a new volume. If this is not set then we use the value from the storage_availability_zone option as the default availability_zone for new volumes.</td>
               </tr>
               <tr>
-                       <td>default_log_levels = amqplib=WARN, sqlalchemy=WARN, boto=WARN, suds=INFO, keystone=INFO, eventlet.wsgi.server=WARN</td>
+                       <td>default_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, keystone=INFO, qpid=WARN, sqlalchemy=WARN, suds=INFO, iso8601=WARN</td>
                        <td>(ListOpt) list of logger=LEVEL pairs</td>
               </tr>
               <tr>
@@ -92,8 +92,8 @@
                        <td>(StrOpt) Directory to use for lock files. Default to a temp directory</td>
               </tr>
               <tr>
-                       <td>log_config = None</td>
+                       <td>log_config_append = None</td>
-                       <td>(StrOpt) If this option is specified, the logging configuration file specified is used and overrides any other logging options specified. Please see the Python logging module documentation for details on logging configuration files.</td>
+                       <td>(StrOpt) The name of logging configuration file. It does not disable existing loggers, but just appends specified logging configuration to any other existing logging options. Please see the Python logging module documentation for details on logging configuration files.</td>
               </tr>
               <tr>
                        <td>log_date_format = %Y-%m-%d %H:%M:%S</td>
@@ -109,7 +109,7 @@
               </tr>
               <tr>
                        <td>log_format = None</td>
-                       <td>(StrOpt) A logging.Formatter log message format string which may use any of the available logging.LogRecord attributes. This option is deprecated.  Please use logging_context_format_string and logging_default_format_string instead.</td>
+                       <td>(StrOpt) DEPRECATED. A logging.Formatter log message format string which may use any of the available logging.LogRecord attributes. This option is deprecated.  Please use logging_context_format_string and logging_default_format_string instead.</td>
               </tr>
               <tr>
                        <td>logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user)s %(tenant)s] %(instance)s%(message)s</td>
@@ -136,7 +136,7 @@
                        <td>(ListOpt) List of modules/decorators to monkey patch</td>
               </tr>
               <tr>
-                       <td>my_ip = 115.146.84.189</td>
+                       <td>my_ip = 192.168.0.8</td>
                        <td>(StrOpt) ip address of this host</td>
               </tr>
               <tr>
@@ -151,6 +151,14 @@
                        <td>password = None</td>
                        <td>(StrOpt) Password for Redis server. (optional)</td>
               </tr>
+              <tr>
+                       <td>periodic_fuzzy_delay = 60</td>
+                       <td>(IntOpt) range of seconds to randomly delay when starting the periodic task scheduler to reduce stampeding. (Disable by setting to 0)</td>
+              </tr>
+              <tr>
+                       <td>periodic_interval = 60</td>
+                       <td>(IntOpt) seconds between running periodic tasks</td>
+              </tr>
               <tr>
                        <td>policy_default_rule = default</td>
                        <td>(StrOpt) Rule checked when requested rule is not found</td>
@@ -164,9 +172,13 @@
                        <td>(IntOpt) Use this port to connect to redis host.</td>
               </tr>
               <tr>
-                       <td>pybasedir = /home/ubuntu/cinder</td>
+                       <td>pybasedir = /usr/lib/python2.7/site-packages</td>
                        <td>(StrOpt) Directory where the cinder python module is installed</td>
               </tr>
+              <tr>
+                       <td>report_interval = 10</td>
+                       <td>(IntOpt) seconds between nodes reporting state to datastore</td>
+              </tr>
               <tr>
                        <td>reserved_percentage = 0</td>
                        <td>(IntOpt) The percentage of backend capacity is reserved</td>

doc/common/tables/cinder-compute.xml

@@ -21,7 +21,7 @@
               </tr>
               <tr>
                        <td>nova_ca_certificates_file = None</td>
-                       <td>(StrOpt) Location of ca certicates file to use for nova client requests.</td>
+                       <td>(StrOpt) Location of ca certificates file to use for nova client requests.</td>
               </tr>
               <tr>
                        <td>nova_catalog_admin_info = compute:nova:adminURL</td>

doc/common/tables/cinder-eqlx.xml

@@ -41,7 +41,7 @@
               </tr>
               <tr>
                        <td>eqlx_use_chap = False</td>
-                       <td>(BoolOpt) Use CHAP authentificaion for targets?</td>
+                       <td>(BoolOpt) Use CHAP authentication for targets?</td>
               </tr>
        </tbody>
         </table>

doc/common/tables/cinder-hp3par.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!-- Warning: Do not edit this file. It is automatically
+             generated and your changes will be overwritten.
+             The tool to do so lives in the tools directory of this
+             repository -->
+        <para xmlns="http://docbook.org/ns/docbook" version="5.0">
+        <table rules="all">
+          <caption>Description of configuration options for hp3par</caption>
+           <col width="50%"/>
+           <col width="50%"/>
+           <thead>
+              <tr>
+                  <th>Configuration option = Default value</th>
+                  <th>Description</th>
+              </tr>
+          </thead>
+          <tbody>
+              <tr>
+                       <td>hp3par_api_url = </td>
+                       <td>(StrOpt) 3PAR WSAPI Server Url like https://&lt;3par ip&gt;:8080/api/v1</td>
+              </tr>
+              <tr>
+                       <td>hp3par_cpg = OpenStack</td>
+                       <td>(StrOpt) The CPG to use for volume creation</td>
+              </tr>
+              <tr>
+                       <td>hp3par_cpg_snap = </td>
+                       <td>(StrOpt) The CPG to use for Snapshots for volumes. If empty hp3par_cpg will be used</td>
+              </tr>
+              <tr>
+                       <td>hp3par_debug = False</td>
+                       <td>(BoolOpt) Enable HTTP debugging to 3PAR</td>
+              </tr>
+              <tr>
+                       <td>hp3par_domain = None</td>
+                       <td>(StrOpt) This option is DEPRECATED and no longer used. The 3par domain name to use.</td>
+              </tr>
+              <tr>
+                       <td>hp3par_iscsi_ips = </td>
+                       <td>(ListOpt) List of target iSCSI addresses to use.</td>
+              </tr>
+              <tr>
+                       <td>hp3par_password = </td>
+                       <td>(StrOpt) 3PAR Super user password</td>
+              </tr>
+              <tr>
+                       <td>hp3par_snapshot_expiration = </td>
+                       <td>(StrOpt) The time in hours when a snapshot expires  and is deleted.  This must be larger than expiration</td>
+              </tr>
+              <tr>
+                       <td>hp3par_snapshot_retention = </td>
+                       <td>(StrOpt) The time in hours to retain a snapshot.  You can't delete it before this expires.</td>
+              </tr>
+              <tr>
+                       <td>hp3par_username = </td>
+                       <td>(StrOpt) 3PAR Super user username</td>
+              </tr>
+       </tbody>
+        </table>
+        </para>

doc/common/tables/cinder-lvm.xml

@@ -23,10 +23,6 @@
                        <td>lvm_type = default</td>
                        <td>(StrOpt) Type of LVM volumes to deploy; (default or thin)</td>
               </tr>
-              <tr>
-                       <td>pool_size = None</td>
-                       <td>(StrOpt) Size of thin provisioning pool (None uses entire cinder VG)</td>
-              </tr>
               <tr>
                        <td>volume_group = cinder-volumes</td>
                        <td>(StrOpt) Name for the VG that will contain exported volumes</td>

doc/common/tables/cinder-nexenta_iscsi.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!-- Warning: Do not edit this file. It is automatically
+             generated and your changes will be overwritten.
+             The tool to do so lives in the tools directory of this
+             repository -->
+        <para xmlns="http://docbook.org/ns/docbook" version="5.0">
+        <table rules="all">
+          <caption>Description of configuration options for nexenta_iscsi</caption>
+           <col width="50%"/>
+           <col width="50%"/>
+           <thead>
+              <tr>
+                  <th>Configuration option = Default value</th>
+                  <th>Description</th>
+              </tr>
+          </thead>
+          <tbody>
+              <tr>
+                       <td>nexenta_blocksize = </td>
+                       <td>(StrOpt) block size for volumes (blank=default,8KB)</td>
+              </tr>
+              <tr>
+                       <td>nexenta_host = </td>
+                       <td>(StrOpt) IP address of Nexenta SA</td>
+              </tr>
+              <tr>
+                       <td>nexenta_iscsi_target_portal_port = 3260</td>
+                       <td>(IntOpt) Nexenta target portal port</td>
+              </tr>
+              <tr>
+                       <td>nexenta_password = nexenta</td>
+                       <td>(StrOpt) Password to connect to Nexenta SA</td>
+              </tr>
+              <tr>
+                       <td>nexenta_rest_port = 2000</td>
+                       <td>(IntOpt) HTTP port to connect to Nexenta REST API server</td>
+              </tr>
+              <tr>
+                       <td>nexenta_rest_protocol = auto</td>
+                       <td>(StrOpt) Use http or https for REST connection (default auto)</td>
+              </tr>
+              <tr>
+                       <td>nexenta_rrmgr_compression = 0</td>
+                       <td>(IntOpt) Enable stream compression, level 1..9. 1 - gives best speed; 9 - gives best compression.</td>
+              </tr>
+              <tr>
+                       <td>nexenta_rrmgr_connections = 2</td>
+                       <td>(IntOpt) Number of TCP connections.</td>
+              </tr>
+              <tr>
+                       <td>nexenta_rrmgr_tcp_buf_size = 4096</td>
+                       <td>(IntOpt) TCP Buffer size in KiloBytes.</td>
+              </tr>
+              <tr>
+                       <td>nexenta_sparse = False</td>
+                       <td>(BoolOpt) flag to create sparse volumes</td>
+              </tr>
+              <tr>
+                       <td>nexenta_sparsed_volumes = True</td>
+                       <td>(BoolOpt) Create volumes as sparsed files which take no space.If set to False volume is created as regular file.In such case volume creation takes a lot of time.</td>
+              </tr>
+              <tr>
+                       <td>nexenta_target_group_prefix = cinder/</td>
+                       <td>(StrOpt) prefix for iSCSI target groups on SA</td>
+              </tr>
+              <tr>
+                       <td>nexenta_target_prefix = iqn.1986-03.com.sun:02:cinder-</td>
+                       <td>(StrOpt) IQN prefix for iSCSI targets</td>
+              </tr>
+              <tr>
+                       <td>nexenta_user = admin</td>
+                       <td>(StrOpt) User name to connect to Nexenta SA</td>
+              </tr>
+              <tr>
+                       <td>nexenta_volume = cinder</td>
+                       <td>(StrOpt) pool on SA that will hold all volumes</td>
+              </tr>
+       </tbody>
+        </table>
+        </para>

doc/common/tables/cinder-nexenta_nfs.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!-- Warning: Do not edit this file. It is automatically
+             generated and your changes will be overwritten.
+             The tool to do so lives in the tools directory of this
+             repository -->
+        <para xmlns="http://docbook.org/ns/docbook" version="5.0">
+        <table rules="all">
+          <caption>Description of configuration options for nexenta_nfs</caption>
+           <col width="50%"/>
+           <col width="50%"/>
+           <thead>
+              <tr>
+                  <th>Configuration option = Default value</th>
+                  <th>Description</th>
+              </tr>
+          </thead>
+          <tbody>
+              <tr>
+                       <td>nexenta_mount_options = None</td>
+                       <td>(StrOpt) Mount options passed to the nfs client. See section of the nfs man page for details</td>
+              </tr>
+              <tr>
+                       <td>nexenta_mount_point_base = $state_path/mnt</td>
+                       <td>(StrOpt) Base dir containing mount points for nfs shares</td>
+              </tr>
+              <tr>
+                       <td>nexenta_nms_cache_volroot = True</td>
+                       <td>(BoolOpt) If set True cache NexentaStor appliance volroot option value.</td>
+              </tr>
+              <tr>
+                       <td>nexenta_oversub_ratio = 1.0</td>
+                       <td>(FloatOpt) This will compare the allocated to available space on the volume destination.  If the ratio exceeds this number, the destination will no longer be valid.</td>
+              </tr>
+              <tr>
+                       <td>nexenta_shares_config = /etc/cinder/nfs_shares</td>
+                       <td>(StrOpt) File with the list of available nfs shares</td>
+              </tr>
+              <tr>
+                       <td>nexenta_used_ratio = 0.95</td>
+                       <td>(FloatOpt) Percent of ACTUAL usage of the underlying volume before no new volumes can be allocated to the volume destination.</td>
+              </tr>
+              <tr>
+                       <td>nexenta_volume_compression = on</td>
+                       <td>(StrOpt) Default compression value for new ZFS folders.</td>
+              </tr>
+       </tbody>
+        </table>
+        </para>

doc/common/tables/cinder-rpc.xml

@@ -151,18 +151,22 @@
                        <td>rabbit_retry_interval = 1</td>
                        <td>(IntOpt) how frequently to retry connecting with RabbitMQ</td>
               </tr>
-              <tr>
-                       <td>rabbit_userid = guest</td>
-                       <td>(StrOpt) the RabbitMQ userid</td>
-              </tr>
               <tr>
                        <td>rabbit_use_ssl = False</td>
                        <td>(BoolOpt) connect over SSL for RabbitMQ</td>
               </tr>
+              <tr>
+                       <td>rabbit_userid = guest</td>
+                       <td>(StrOpt) the RabbitMQ userid</td>
+              </tr>
               <tr>
                        <td>rabbit_virtual_host = /</td>
                        <td>(StrOpt) the RabbitMQ virtual host</td>
               </tr>
+              <tr>
+                       <td>ringfile = /etc/oslo/matchmaker_ring.json</td>
+                       <td>(StrOpt) Matchmaker ring file (JSON)</td>
+              </tr>
               <tr>
                        <td>rpc_backend = cinder.openstack.common.rpc.impl_kombu</td>
                        <td>(StrOpt) The messaging module to use, defaults to kombu.</td>

doc/common/tables/cinder-solidfire.xml

@@ -16,8 +16,8 @@
           </thead>
           <tbody>
               <tr>
-                       <td>sf_account_prefix = docwork</td>
+                       <td>sf_account_prefix = None</td>
-                       <td>(StrOpt) Create SolidFire accounts with this prefix</td>
+                       <td>(StrOpt) Create SolidFire accounts with this prefix. Uses current hostname if unset (default).</td>
               </tr>
               <tr>
                        <td>sf_allow_tenant_qos = False</td>

doc/common/tables/cinder-storage.xml

@@ -15,6 +15,10 @@
               </tr>
           </thead>
           <tbody>
+              <tr>
+                       <td>allocated_capacity_weight_multiplier = -1.0</td>
+                       <td>(FloatOpt) Multiplier used for weighing volume capacity. Negative numbers mean to stack vs spread.</td>
+              </tr>
               <tr>
                        <td>backend = sqlalchemy</td>
                        <td>(StrOpt) The backend to use for db</td>
@@ -115,14 +119,14 @@
                        <td>volume_backend_name = None</td>
                        <td>(StrOpt) The backend name for a given driver implementation</td>
               </tr>
-              <tr>
-                       <td>volume_clear_size = 0</td>
-                       <td>(IntOpt) Size in MiB to wipe at start of old volumes. 0  = &gt; all</td>
-              </tr>
               <tr>
                        <td>volume_clear = zero</td>
                        <td>(StrOpt) Method used to wipe old voumes (valid options are: none, zero, shred)</td>
               </tr>
+              <tr>
+                       <td>volume_clear_size = 0</td>
+                       <td>(IntOpt) Size in MiB to wipe at start of old volumes. 0 =&gt; all</td>
+              </tr>
               <tr>
                        <td>volume_dd_blocksize = 1M</td>
                        <td>(StrOpt) The default block size used when copying/clearing volumes</td>
@@ -136,13 +140,17 @@
                        <td>(StrOpt) full class name for the Manager for volume</td>
               </tr>
               <tr>
-                       <td>volumes_dir = $state_path/volumes</td>
+                       <td>volume_service_inithost_offload = False</td>
-                       <td>(StrOpt) Volume configuration file storage directory</td>
+                       <td>(BoolOpt) Offload pending volume delete during volume service startup</td>
               </tr>
               <tr>
                        <td>volume_usage_audit_period = month</td>
                        <td>(StrOpt) time period to generate volume usages for.  Time period must be hour, day, month or year</td>
               </tr>
+              <tr>
+                       <td>volumes_dir = $state_path/volumes</td>
+                       <td>(StrOpt) Volume configuration file storage directory</td>
+              </tr>
               <tr>
                        <td>zadara_default_stripesize = 64</td>
                        <td>(StrOpt) Default stripe size for volumes</td>

doc/common/tables/cinder-storwize.xml

@@ -55,10 +55,6 @@
                        <td>storwize_svc_vol_iogrp = 0</td>
                        <td>(IntOpt) The I/O group in which to allocate volumes</td>
               </tr>
-              <tr>
-                       <td>storwize_svc_volpool_name = volpool</td>
-                       <td>(StrOpt) Storage system storage pool for volumes</td>
-              </tr>
               <tr>
                        <td>storwize_svc_vol_rsize = 2</td>
                        <td>(IntOpt) Storage system space-efficiency parameter for volumes (percentage)</td>
@@ -67,6 +63,10 @@
                        <td>storwize_svc_vol_warning = 0</td>
                        <td>(IntOpt) Storage system threshold for volume capacity warnings (percentage)</td>
               </tr>
+              <tr>
+                       <td>storwize_svc_volpool_name = volpool</td>
+                       <td>(StrOpt) Storage system storage pool for volumes</td>
+              </tr>
        </tbody>
         </table>
         </para>

tools/autogenerate-config-flagmappings/cinder.flagmappings

@@ -1,3 +1,4 @@
+allocated_capacity_weight_multiplier storage
 allowed_direct_url_schemes images
 allowed_rpc_exception_modules rpc
 amqp_auto_delete rpc
@@ -58,10 +59,10 @@ 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 eqlx
 eqlx_chap_password eqlx
 eqlx_cli_max_retries eqlx
@@ -82,7 +83,6 @@ glance_host images
 glance_num_retries images
 glance_port images
 glance_request_timeout images
-glusterfs_disk_util storage_glusterfs
 glusterfs_mount_point_base storage_glusterfs
 glusterfs_qcow2_volumes storage_glusterfs
 glusterfs_shares_config storage_glusterfs
@@ -127,7 +127,7 @@ kombu_ssl_keyfile rpc
 kombu_ssl_version rpc
 lio_initiator_iqns common
 lock_path common
-log_config common
+log_config_append common
 log_date_format common
 log_dir common
 log_file common
@@ -168,19 +168,23 @@ nexenta_host nexenta_iscsi
 nexenta_iscsi_target_portal_port nexenta_iscsi
 nexenta_mount_options nexenta_nfs
 nexenta_mount_point_base nexenta_nfs
+nexenta_nms_cache_volroot nexenta_nfs
 nexenta_oversub_ratio nexenta_nfs
 nexenta_password nexenta_iscsi
 nexenta_rest_port nexenta_iscsi
 nexenta_rest_protocol nexenta_iscsi
+nexenta_rrmgr_compression nexenta_iscsi
+nexenta_rrmgr_connections nexenta_iscsi
+nexenta_rrmgr_tcp_buf_size nexenta_iscsi
 nexenta_shares_config nexenta_nfs
-nexenta_sparsed_volumes nexenta_iscsi
 nexenta_sparse nexenta_iscsi
+nexenta_sparsed_volumes 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
+nexenta_volume_compression nexenta_nfs
 nfs_mount_options storage_nfs
 nfs_mount_point_base storage_nfs
 nfs_oversub_ratio storage_nfs
@@ -199,16 +203,19 @@ nova_endpoint_template compute
 num_iser_scan_tries storage
 num_shell_tries common
 num_volume_device_scan_tries storage
+os_region_name compute
 osapi_max_limit api
 osapi_max_request_body_size api
 osapi_volume_base_URL api
-osapi_volume_extension api
 osapi_volume_ext_list api
-os_region_name compute
+osapi_volume_extension api
+osapi_volume_listen api
+osapi_volume_listen_port api
 password common
+periodic_fuzzy_delay common
+periodic_interval common
 policy_default_rule common
 policy_file common
-pool_size lvm
 port common
 publish_errors rpc
 pybasedir common
@@ -234,8 +241,8 @@ rabbit_password rpc
 rabbit_port rpc
 rabbit_retry_backoff rpc
 rabbit_retry_interval rpc
-rabbit_userid rpc
 rabbit_use_ssl rpc
+rabbit_userid rpc
 rabbit_virtual_host rpc
 rbd_ceph_conf storage_ceph
 rbd_flatten_volume_from_snapshot storage_ceph
@@ -243,10 +250,12 @@ rbd_max_clone_depth storage_ceph
 rbd_pool storage_ceph
 rbd_secret_uuid storage_ceph
 rbd_user storage_ceph
+report_interval common
 reservation_expire quota
 reserved_percentage common
 restore_discard_excess_bytes backups_ceph
 retry_interval common
+ringfile rpc
 root_helper common
 rootwrap_config common
 rpc_backend rpc
@@ -309,9 +318,9 @@ 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
+storwize_svc_volpool_name storwize
 syslog_log_facility common
 tcp_keepidle common
 thres_avl_size_perc_start netapp_7mode_nfs netapp_cdot_nfs
@@ -337,19 +346,20 @@ vmware_volume_folder vmware
 vmware_wsdl_location vmware
 volume_api_class api
 volume_backend_name storage
-volume_clear_size storage
 volume_clear storage
+volume_clear_size storage
 volume_dd_blocksize storage
 volume_driver storage
 volume_group lvm
 volume_manager storage
 volume_name_template api
-volumes_dir storage
+volume_service_inithost_offload storage
 volume_tmp_dir storage_ceph
 volume_topic rpc
 volume_transfer_key_length api
 volume_transfer_salt_length api
 volume_usage_audit_period storage
+volumes_dir storage
 windows_iscsi_lun_path windows
 xenapi_connection_password storage_xen
 xenapi_connection_url storage_xen