From 155ae54942e6dfce344ae40f2b7c69eb369e82b8 Mon Sep 17 00:00:00 2001 From: Shaun McCance Date: Wed, 8 Jan 2014 10:12:03 -0500 Subject: [PATCH] Update cinder options for icehouse Change-Id: If23fc120c239b2b4fbc4c7fc715b0ba3f9d817ea --- doc/common/tables/cinder-api.xml | 18 +++-- doc/common/tables/cinder-common.xml | 28 +++++-- doc/common/tables/cinder-compute.xml | 2 +- doc/common/tables/cinder-coraid.xml | 2 +- doc/common/tables/cinder-eqlx.xml | 2 +- doc/common/tables/cinder-hp3par.xml | 60 ++++++++++++++ doc/common/tables/cinder-lvm.xml | 4 - doc/common/tables/cinder-nexenta_iscsi.xml | 80 +++++++++++++++++++ doc/common/tables/cinder-nexenta_nfs.xml | 48 +++++++++++ doc/common/tables/cinder-rpc.xml | 14 ++-- doc/common/tables/cinder-solidfire.xml | 4 +- doc/common/tables/cinder-storage.xml | 22 +++-- .../tables/cinder-storage_glusterfs.xml | 2 +- doc/common/tables/cinder-storage_gpfs.xml | 2 +- doc/common/tables/cinder-storwize.xml | 8 +- .../cinder.flagmappings | 34 +++++--- 16 files changed, 278 insertions(+), 52 deletions(-) create mode 100644 doc/common/tables/cinder-hp3par.xml create mode 100644 doc/common/tables/cinder-nexenta_iscsi.xml create mode 100644 doc/common/tables/cinder-nexenta_nfs.xml diff --git a/doc/common/tables/cinder-api.xml b/doc/common/tables/cinder-api.xml index d74821c7ba..e25fcff13f 100644 --- a/doc/common/tables/cinder-api.xml +++ b/doc/common/tables/cinder-api.xml @@ -25,15 +25,15 @@ backdoor_port = None - (IntOpt) port for eventlet backdoor to listen + (StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> 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. enable_v1_api = True - (BoolOpt) Deploy v1 of the Cinder API. + (BoolOpt) Deploy v1 of the Cinder API. enable_v2_api = True - (BoolOpt) Deploy v2 of the Cinder API. + (BoolOpt) Deploy v2 of the Cinder API. osapi_max_limit = 1000 @@ -47,13 +47,21 @@ osapi_volume_base_URL = None (StrOpt) Base URL that will be presented to users in links to the OpenStack Volume API + + osapi_volume_ext_list = + (ListOpt) Specify list of extensions to load when using osapi_volume_extension option with cinder.api.contrib.select_extensions + osapi_volume_extension = ['cinder.api.contrib.standard_extensions'] (MultiStrOpt) osapi volume extension to load - osapi_volume_ext_list = - (ListOpt) Specify list of extensions to load when using osapi_volume_extension option with cinder.api.contrib.select_extensions + osapi_volume_listen = 0.0.0.0 + (StrOpt) IP address for OpenStack Volume API to listen + + + osapi_volume_listen_port = 8776 + (IntOpt) port for os volume api to listen transfer_api_class = cinder.transfer.api.API diff --git a/doc/common/tables/cinder-common.xml b/doc/common/tables/cinder-common.xml index e1fd4d0c30..cbb58a46c2 100644 --- a/doc/common/tables/cinder-common.xml +++ b/doc/common/tables/cinder-common.xml @@ -28,8 +28,8 @@ (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. - default_log_levels = amqplib=WARN, sqlalchemy=WARN, boto=WARN, suds=INFO, keystone=INFO, eventlet.wsgi.server=WARN - (ListOpt) list of logger = LEVEL pairs + default_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, keystone=INFO, qpid=WARN, sqlalchemy=WARN, suds=INFO, iso8601=WARN + (ListOpt) list of logger=LEVEL pairs default_notification_level = INFO @@ -92,8 +92,8 @@ (StrOpt) Directory to use for lock files. Default to a temp directory - log_config = None - (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. + log_config_append = None + (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. log_date_format = %Y-%m-%d %H:%M:%S @@ -109,7 +109,7 @@ log_format = None - (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. + (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. 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 @@ -136,7 +136,7 @@ (ListOpt) List of modules/decorators to monkey patch - my_ip = 115.146.84.189 + my_ip = 192.168.0.8 (StrOpt) ip address of this host @@ -151,6 +151,14 @@ password = None (StrOpt) Password for Redis server. (optional) + + periodic_fuzzy_delay = 60 + (IntOpt) range of seconds to randomly delay when starting the periodic task scheduler to reduce stampeding. (Disable by setting to 0) + + + periodic_interval = 60 + (IntOpt) seconds between running periodic tasks + policy_default_rule = default (StrOpt) Rule checked when requested rule is not found @@ -164,9 +172,13 @@ (IntOpt) Use this port to connect to redis host. - pybasedir = /home/ubuntu/cinder + pybasedir = /usr/lib/python2.7/site-packages (StrOpt) Directory where the cinder python module is installed + + report_interval = 10 + (IntOpt) seconds between nodes reporting state to datastore + reserved_percentage = 0 (IntOpt) The percentage of backend capacity is reserved @@ -257,4 +269,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-compute.xml b/doc/common/tables/cinder-compute.xml index 818322df74..ed8fdb0298 100644 --- a/doc/common/tables/cinder-compute.xml +++ b/doc/common/tables/cinder-compute.xml @@ -21,7 +21,7 @@ nova_ca_certificates_file = None - (StrOpt) Location of ca certicates file to use for nova client requests. + (StrOpt) Location of ca certificates file to use for nova client requests. nova_catalog_admin_info = compute:nova:adminURL diff --git a/doc/common/tables/cinder-coraid.xml b/doc/common/tables/cinder-coraid.xml index 705d38fb74..b120387e7a 100644 --- a/doc/common/tables/cinder-coraid.xml +++ b/doc/common/tables/cinder-coraid.xml @@ -37,4 +37,4 @@ - + \ No newline at end of file diff --git a/doc/common/tables/cinder-eqlx.xml b/doc/common/tables/cinder-eqlx.xml index 2070e3acf4..05352ce446 100644 --- a/doc/common/tables/cinder-eqlx.xml +++ b/doc/common/tables/cinder-eqlx.xml @@ -41,7 +41,7 @@ eqlx_use_chap = False - (BoolOpt) Use CHAP authentificaion for targets? + (BoolOpt) Use CHAP authentication for targets? diff --git a/doc/common/tables/cinder-hp3par.xml b/doc/common/tables/cinder-hp3par.xml new file mode 100644 index 0000000000..66bd6a85bb --- /dev/null +++ b/doc/common/tables/cinder-hp3par.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for hp3par
Configuration option = Default valueDescription
hp3par_api_url = (StrOpt) 3PAR WSAPI Server Url like https://<3par ip>:8080/api/v1
hp3par_cpg = OpenStack(StrOpt) The CPG to use for volume creation
hp3par_cpg_snap = (StrOpt) The CPG to use for Snapshots for volumes. If empty hp3par_cpg will be used
hp3par_debug = False(BoolOpt) Enable HTTP debugging to 3PAR
hp3par_domain = None(StrOpt) This option is DEPRECATED and no longer used. The 3par domain name to use.
hp3par_iscsi_ips = (ListOpt) List of target iSCSI addresses to use.
hp3par_password = (StrOpt) 3PAR Super user password
hp3par_snapshot_expiration = (StrOpt) The time in hours when a snapshot expires and is deleted. This must be larger than expiration
hp3par_snapshot_retention = (StrOpt) The time in hours to retain a snapshot. You can't delete it before this expires.
hp3par_username = (StrOpt) 3PAR Super user username
+ \ No newline at end of file diff --git a/doc/common/tables/cinder-lvm.xml b/doc/common/tables/cinder-lvm.xml index 35a968ddf2..612b8f1c9e 100644 --- a/doc/common/tables/cinder-lvm.xml +++ b/doc/common/tables/cinder-lvm.xml @@ -23,10 +23,6 @@ lvm_type = default (StrOpt) Type of LVM volumes to deploy; (default or thin) - - pool_size = None - (StrOpt) Size of thin provisioning pool (None uses entire cinder VG) - volume_group = cinder-volumes (StrOpt) Name for the VG that will contain exported volumes diff --git a/doc/common/tables/cinder-nexenta_iscsi.xml b/doc/common/tables/cinder-nexenta_iscsi.xml new file mode 100644 index 0000000000..de10b268b4 --- /dev/null +++ b/doc/common/tables/cinder-nexenta_iscsi.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for nexenta_iscsi
Configuration option = Default valueDescription
nexenta_blocksize = (StrOpt) block size for volumes (blank=default,8KB)
nexenta_host = (StrOpt) IP address of Nexenta SA
nexenta_iscsi_target_portal_port = 3260(IntOpt) Nexenta target portal port
nexenta_password = nexenta(StrOpt) Password to connect to Nexenta SA
nexenta_rest_port = 2000(IntOpt) HTTP port to connect to Nexenta REST API server
nexenta_rest_protocol = auto(StrOpt) Use http or https for REST connection (default auto)
nexenta_rrmgr_compression = 0(IntOpt) Enable stream compression, level 1..9. 1 - gives best speed; 9 - gives best compression.
nexenta_rrmgr_connections = 2(IntOpt) Number of TCP connections.
nexenta_rrmgr_tcp_buf_size = 4096(IntOpt) TCP Buffer size in KiloBytes.
nexenta_sparse = False(BoolOpt) flag to create sparse volumes
nexenta_sparsed_volumes = True(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.
nexenta_target_group_prefix = cinder/(StrOpt) prefix for iSCSI target groups on SA
nexenta_target_prefix = iqn.1986-03.com.sun:02:cinder-(StrOpt) IQN prefix for iSCSI targets
nexenta_user = admin(StrOpt) User name to connect to Nexenta SA
nexenta_volume = cinder(StrOpt) pool on SA that will hold all volumes
+ \ No newline at end of file diff --git a/doc/common/tables/cinder-nexenta_nfs.xml b/doc/common/tables/cinder-nexenta_nfs.xml new file mode 100644 index 0000000000..77b8a7971d --- /dev/null +++ b/doc/common/tables/cinder-nexenta_nfs.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for nexenta_nfs
Configuration option = Default valueDescription
nexenta_mount_options = None(StrOpt) Mount options passed to the nfs client. See section of the nfs man page for details
nexenta_mount_point_base = $state_path/mnt(StrOpt) Base dir containing mount points for nfs shares
nexenta_nms_cache_volroot = True(BoolOpt) If set True cache NexentaStor appliance volroot option value.
nexenta_oversub_ratio = 1.0(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.
nexenta_shares_config = /etc/cinder/nfs_shares(StrOpt) File with the list of available nfs shares
nexenta_used_ratio = 0.95(FloatOpt) Percent of ACTUAL usage of the underlying volume before no new volumes can be allocated to the volume destination.
nexenta_volume_compression = on(StrOpt) Default compression value for new ZFS folders.
+ \ No newline at end of file diff --git a/doc/common/tables/cinder-rpc.xml b/doc/common/tables/cinder-rpc.xml index 640968faf7..6cdb841603 100644 --- a/doc/common/tables/cinder-rpc.xml +++ b/doc/common/tables/cinder-rpc.xml @@ -151,18 +151,22 @@ rabbit_retry_interval = 1 (IntOpt) how frequently to retry connecting with RabbitMQ - - rabbit_userid = guest - (StrOpt) the RabbitMQ userid - rabbit_use_ssl = False (BoolOpt) connect over SSL for RabbitMQ + + rabbit_userid = guest + (StrOpt) the RabbitMQ userid + rabbit_virtual_host = / (StrOpt) the RabbitMQ virtual host + + ringfile = /etc/oslo/matchmaker_ring.json + (StrOpt) Matchmaker ring file (JSON) + rpc_backend = cinder.openstack.common.rpc.impl_kombu (StrOpt) The messaging module to use, defaults to kombu. @@ -217,4 +221,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-solidfire.xml b/doc/common/tables/cinder-solidfire.xml index c64d8b3c20..c16d80c519 100644 --- a/doc/common/tables/cinder-solidfire.xml +++ b/doc/common/tables/cinder-solidfire.xml @@ -16,8 +16,8 @@ - sf_account_prefix = docwork - (StrOpt) Create SolidFire accounts with this prefix + sf_account_prefix = None + (StrOpt) Create SolidFire accounts with this prefix. Uses current hostname if unset (default). sf_allow_tenant_qos = False diff --git a/doc/common/tables/cinder-storage.xml b/doc/common/tables/cinder-storage.xml index 7bc0613b7c..17e2a906b2 100644 --- a/doc/common/tables/cinder-storage.xml +++ b/doc/common/tables/cinder-storage.xml @@ -15,6 +15,10 @@ + + allocated_capacity_weight_multiplier = -1.0 + (FloatOpt) Multiplier used for weighing volume capacity. Negative numbers mean to stack vs spread. + backend = sqlalchemy (StrOpt) The backend to use for db @@ -115,14 +119,14 @@ volume_backend_name = None (StrOpt) The backend name for a given driver implementation - - volume_clear_size = 0 - (IntOpt) Size in MiB to wipe at start of old volumes. 0 = > all - volume_clear = zero (StrOpt) Method used to wipe old voumes (valid options are: none, zero, shred) + + volume_clear_size = 0 + (IntOpt) Size in MiB to wipe at start of old volumes. 0 => all + volume_dd_blocksize = 1M (StrOpt) The default block size used when copying/clearing volumes @@ -136,17 +140,21 @@ (StrOpt) full class name for the Manager for volume - volumes_dir = $state_path/volumes - (StrOpt) Volume configuration file storage directory + volume_service_inithost_offload = False + (BoolOpt) Offload pending volume delete during volume service startup volume_usage_audit_period = month (StrOpt) time period to generate volume usages for. Time period must be hour, day, month or year + + volumes_dir = $state_path/volumes + (StrOpt) Volume configuration file storage directory + zadara_default_stripesize = 64 (StrOpt) Default stripe size for volumes - + \ No newline at end of file diff --git a/doc/common/tables/cinder-storage_glusterfs.xml b/doc/common/tables/cinder-storage_glusterfs.xml index 9fd0d2edbd..e4a14f7ff9 100644 --- a/doc/common/tables/cinder-storage_glusterfs.xml +++ b/doc/common/tables/cinder-storage_glusterfs.xml @@ -33,4 +33,4 @@ - + \ No newline at end of file diff --git a/doc/common/tables/cinder-storage_gpfs.xml b/doc/common/tables/cinder-storage_gpfs.xml index 38148cba76..2fe6c64e6e 100644 --- a/doc/common/tables/cinder-storage_gpfs.xml +++ b/doc/common/tables/cinder-storage_gpfs.xml @@ -37,4 +37,4 @@ - + \ No newline at end of file diff --git a/doc/common/tables/cinder-storwize.xml b/doc/common/tables/cinder-storwize.xml index 2091bd19d2..2de5f8fa0d 100644 --- a/doc/common/tables/cinder-storwize.xml +++ b/doc/common/tables/cinder-storwize.xml @@ -55,10 +55,6 @@ storwize_svc_vol_iogrp = 0 (IntOpt) The I/O group in which to allocate volumes - - storwize_svc_volpool_name = volpool - (StrOpt) Storage system storage pool for volumes - storwize_svc_vol_rsize = 2 (IntOpt) Storage system space-efficiency parameter for volumes (percentage) @@ -67,6 +63,10 @@ storwize_svc_vol_warning = 0 (IntOpt) Storage system threshold for volume capacity warnings (percentage) + + storwize_svc_volpool_name = volpool + (StrOpt) Storage system storage pool for volumes + \ No newline at end of file diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index 983baeb28c..61997c26c8 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/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