diff --git a/doc/common/tables/cinder-common.xml b/doc/common/tables/cinder-common.xml index be881b2139..c575d45c21 100644 --- a/doc/common/tables/cinder-common.xml +++ b/doc/common/tables/cinder-common.xml @@ -34,14 +34,6 @@ default_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN (ListOpt) List of logger=LEVEL pairs - - default_notification_level = INFO - (StrOpt) Default notification level for outgoing notifications - - - default_publisher_id = None - (StrOpt) Default publisher_id for outgoing notifications - default_volume_type = None (StrOpt) default volume type to use @@ -245,28 +237,6 @@ use_tpool = False (BoolOpt) Enable the experimental use of thread pooling for all DB API calls - - [matchmaker_redis] - - - host = 127.0.0.1 - (StrOpt) Host to locate redis - - - password = None - (StrOpt) Password for Redis server. (optional) - - - port = 6379 - (IntOpt) Use this port to connect to redis host. - - - [rpc_notifier2] - - - topics = notifications - (ListOpt) AMQP topic(s) used for OpenStack notifications - diff --git a/doc/common/tables/cinder-rpc.xml b/doc/common/tables/cinder-rpc.xml index 3daac4e245..ee03769067 100644 --- a/doc/common/tables/cinder-rpc.xml +++ b/doc/common/tables/cinder-rpc.xml @@ -42,25 +42,29 @@ fake_rabbit = False (BoolOpt) If passed, use a fake RabbitMQ provider + + kombu_reconnect_delay = 1.0 + (FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. + kombu_ssl_ca_certs = - (StrOpt) SSL certification authority file (valid only if SSL enabled) + (StrOpt) SSL certification authority file (valid only if SSL enabled). kombu_ssl_certfile = - (StrOpt) SSL cert file (valid only if SSL enabled) + (StrOpt) SSL cert file (valid only if SSL enabled). kombu_ssl_keyfile = - (StrOpt) SSL key file (valid only if SSL enabled) + (StrOpt) SSL key file (valid only if SSL enabled). kombu_ssl_version = - (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions + (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions. matchmaker_heartbeat_freq = 300 - (IntOpt) Heartbeat frequency + (IntOpt) Heartbeat frequency. matchmaker_heartbeat_ttl = 600 @@ -68,11 +72,19 @@ notification_driver = [] - (MultiStrOpt) Driver or drivers to handle sending notifications + (MultiStrOpt) Driver or drivers to handle sending notifications. notification_topics = notifications - (ListOpt) AMQP topic used for OpenStack notifications + (ListOpt) AMQP topic used for OpenStack notifications. + + + password = None + (StrOpt) Password for Redis server (optional). + + + port = 6379 + (IntOpt) Use this port to connect to redis host. publish_errors = False @@ -80,35 +92,35 @@ qpid_heartbeat = 60 - (IntOpt) Seconds between connection keepalive heartbeats + (IntOpt) Seconds between connection keepalive heartbeats. qpid_hostname = oslo - (StrOpt) Qpid broker hostname + (StrOpt) Qpid broker hostname. qpid_hosts = $qpid_hostname:$qpid_port - (ListOpt) Qpid HA cluster host:port pairs + (ListOpt) Qpid HA cluster host:port pairs. qpid_password = - (StrOpt) Password for qpid connection + (StrOpt) Password for Qpid connection. qpid_port = 5672 - (IntOpt) Qpid broker port + (IntOpt) Qpid broker port. qpid_protocol = tcp - (StrOpt) Transport to use, either 'tcp' or 'ssl' + (StrOpt) Transport to use, either 'tcp' or 'ssl'. qpid_sasl_mechanisms = - (StrOpt) Space separated list of SASL mechanisms to use for auth + (StrOpt) Space separated list of SASL mechanisms to use for auth. qpid_tcp_nodelay = True - (BoolOpt) Disable Nagle algorithm + (BoolOpt) Whether to disable the Nagle algorithm. qpid_topology_version = 1 @@ -116,51 +128,55 @@ qpid_username = - (StrOpt) Username for qpid connection + (StrOpt) Username for Qpid connection. rabbit_ha_queues = False - (BoolOpt) use H/A queues in RabbitMQ (x-ha-policy: all).You need to wipe RabbitMQ database when changing this option. + (BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. rabbit_host = oslo - (StrOpt) The RabbitMQ broker address where a single node is used + (StrOpt) The RabbitMQ broker address where a single node is used. rabbit_hosts = $rabbit_host:$rabbit_port - (ListOpt) RabbitMQ HA cluster host:port pairs + (ListOpt) RabbitMQ HA cluster host:port pairs. + + + rabbit_login_method = AMQPLAIN + (StrOpt) the RabbitMQ login method rabbit_max_retries = 0 - (IntOpt) maximum retries with trying to connect to RabbitMQ (the default of 0 implies an infinite retry count) + (IntOpt) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count). rabbit_password = guest - (StrOpt) the RabbitMQ password + (StrOpt) The RabbitMQ password. rabbit_port = 5672 - (IntOpt) The RabbitMQ broker port where a single node is used + (IntOpt) The RabbitMQ broker port where a single node is used. rabbit_retry_backoff = 2 - (IntOpt) how long to backoff for between retries when connecting to RabbitMQ + (IntOpt) How long to backoff for between retries when connecting to RabbitMQ. rabbit_retry_interval = 1 - (IntOpt) how frequently to retry connecting with RabbitMQ + (IntOpt) How frequently to retry connecting with RabbitMQ. rabbit_use_ssl = False - (BoolOpt) connect over SSL for RabbitMQ + (BoolOpt) Connect over SSL for RabbitMQ. rabbit_userid = guest - (StrOpt) the RabbitMQ userid + (StrOpt) The RabbitMQ userid. rabbit_virtual_host = / - (StrOpt) the RabbitMQ virtual host + (StrOpt) The RabbitMQ virtual host. rpc_backend = cinder.openstack.common.rpc.impl_kombu @@ -188,7 +204,7 @@ rpc_zmq_contexts = 1 - (IntOpt) Number of ZeroMQ contexts, defaults to 1 + (IntOpt) Number of ZeroMQ contexts, defaults to 1. rpc_zmq_host = oslo @@ -196,20 +212,24 @@ rpc_zmq_ipc_dir = /var/run/openstack - (StrOpt) Directory for holding IPC sockets + (StrOpt) Directory for holding IPC sockets. - rpc_zmq_matchmaker = cinder.openstack.common.rpc.matchmaker.MatchMakerLocalhost - (StrOpt) MatchMaker driver + rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker.MatchMakerLocalhost + (StrOpt) MatchMaker driver. rpc_zmq_port = 9501 - (IntOpt) ZeroMQ receiver listening port + (IntOpt) ZeroMQ receiver listening port. rpc_zmq_topic_backlog = None (IntOpt) Maximum number of ingress messages to locally buffer per topic. Default is unlimited. + + transport_url = None + (StrOpt) A URL representing the messaging driver to use and its full configuration. If not set, we fall back to the rpc_backend option and driver specific configuration. + volume_topic = cinder-volume (StrOpt) the topic volume nodes listen on @@ -219,22 +239,7 @@ ringfile = /etc/oslo/matchmaker_ring.json - (StrOpt) Matchmaker ring file (JSON) - - - [DEFAULT] - - - port = 6379 - (IntOpt) Use this port to connect to redis host. - - - password = None - (StrOpt) Password for Redis server. (optional) - - - transport_url = None - (StrOpt) A URL representing the messaging driver to use and its full configuration. If not set, we fall back to the rpc_backend option and driver specific configuration. + (StrOpt) Matchmaker ring file (JSON). diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index e5779498a4..905c3ce841 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -48,8 +48,6 @@ db_driver database debug common default_availability_zone common default_log_levels common -default_notification_level common -default_publisher_id common default_timeout rpc default_volume_type common disable_process_locking common @@ -119,6 +117,7 @@ iser_ip_address storage iser_num_targets storage iser_port storage iser_target_prefix storage +kombu_reconnect_delay rpc kombu_ssl_ca_certs rpc kombu_ssl_certfile rpc kombu_ssl_keyfile rpc @@ -215,11 +214,13 @@ osapi_volume_extension api osapi_volume_listen api osapi_volume_listen_port api osapi_volume_workers api +password rpc pbm_default_policy vmware periodic_fuzzy_delay common periodic_interval common policy_default_rule common policy_file common +port rpc publish_errors rpc qpid_heartbeat rpc qpid_hostname rpc @@ -238,6 +239,7 @@ quota_volumes quota rabbit_ha_queues rpc rabbit_host rpc rabbit_hosts rpc +rabbit_login_method rpc rabbit_max_retries rpc rabbit_password rpc rabbit_port rpc @@ -326,6 +328,7 @@ tcp_keepidle common thres_avl_size_perc_start netapp_7mode_nfs netapp_cdot_nfs thres_avl_size_perc_stop netapp_7mode_nfs netapp_cdot_nfs transfer_api_class api +transport_url rpc until_refresh common use_default_quota_class quota use_forwarded_for common @@ -408,14 +411,7 @@ fc-zone-manager/zone_driver zoning_manager fc-zone-manager/zoning_policy zoning keymgr/api_class keymgr keymgr/fixed_key keymgr -matchmaker_redis/host common -matchmaker_redis/password common -matchmaker_redis/port common matchmaker_ring/ringfile rpc -rpc_notifier2/topics common ssl/ca_file ssl ssl/cert_file ssl ssl/key_file ssl -port rpc -password rpc -transport_url rpc