From ebebc846d17dfbe10662657c9e427f07acc412b1 Mon Sep 17 00:00:00 2001 From: liyingjun Date: Wed, 25 Jun 2014 02:09:34 +0800 Subject: [PATCH] use oslo.db module * Use oslo.db module instead of rally.openstack.common.db * Remove rally/openstack/common/db Change-Id: I78e29810f4bf6cc624417744dd74f15ef2281edf --- etc/rally/rally.conf.sample | 135 ++++++++++++++++++++++-------------- requirements.txt | 1 + 2 files changed, 84 insertions(+), 52 deletions(-) diff --git a/etc/rally/rally.conf.sample b/etc/rally/rally.conf.sample index f2a4d6cf..66023913 100644 --- a/etc/rally/rally.conf.sample +++ b/etc/rally/rally.conf.sample @@ -8,6 +8,21 @@ #fatal_exception_format_errors=false +# +# Options defined in rally.openstack.common.eventlet_backdoor +# + +# Enable eventlet backdoor. Acceptable values are 0, , +# and :, where 0 results in listening on a random +# tcp port number; results in listening on the +# specified port number (and not enabling backdoor if that +# port is in use); and : 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. (string value) +#backdoor_port= + + # # Options defined in rally.openstack.common.lockutils # @@ -31,47 +46,48 @@ # of default WARNING level). (boolean value) #verbose=false -# Log output to standard error (boolean value) +# Log output to standard error. (boolean value) #use_stderr=true -# Format string to use for log messages with context (string +# Format string to use for log messages with context. (string # value) #logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s -# Format string to use for log messages without context +# Format string to use for log messages without context. # (string value) #logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s -# Data to append to log format when level is DEBUG (string +# Data to append to log format when level is DEBUG. (string # value) #logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d -# Prefix each line of exception output with this format +# Prefix each line of exception output with this format. # (string value) #logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s -# List of logger=LEVEL pairs (list value) +# List of logger=LEVEL pairs. (list value) #default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN -# Publish error events (boolean value) +# Enables or disables publication of error events. (boolean +# value) #publish_errors=false -# Make deprecations fatal (boolean value) +# Enables or disables fatal status of deprecations. (boolean +# value) #fatal_deprecations=false -# If an instance is passed with the log message, format it -# like this (string value) +# The format for an instance that is passed with the log +# message. (string value) #instance_format="[instance: %(uuid)s] " -# If an instance UUID is passed with the log message, format -# it like this (string value) +# The format for an instance UUID that is passed with the log +# message. (string value) #instance_uuid_format="[instance: %(uuid)s] " -# 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. (string value) +# The name of a logging configuration file. This file is +# appended to any existing logging configuration files. For +# details about logging configuration files, see the Python +# logging module documentation. (string value) # Deprecated group/name - [DEFAULT]/log_config #log_config_append= @@ -83,7 +99,7 @@ #log_format= # Format string for %%(asctime)s in log records. Default: -# %(default)s (string value) +# %(default)s . (string value) #log_date_format=%Y-%m-%d %H:%M:%S # (Optional) Name of log file to output to. If no default is @@ -92,24 +108,34 @@ #log_file= # (Optional) The base directory used for relative --log-file -# paths (string value) +# paths. (string value) # Deprecated group/name - [DEFAULT]/logdir #log_dir= # Use syslog for logging. Existing syslog format is DEPRECATED -# during I, and then will be changed in J to honor RFC5424 -# (boolean value) +# during I, and will change in J to honor RFC5424. (boolean +# value) #use_syslog=false -# (Optional) Use syslog rfc5424 format for logging. If -# enabled, will add APP-NAME (RFC5424) before the MSG part of -# the syslog message. The old format without APP-NAME is -# deprecated in I, and will be removed in J. (boolean value) +# (Optional) Enables or disables syslog rfc5424 format for +# logging. If enabled, prefixes the MSG part of the syslog +# message with APP-NAME (RFC5424). The format without the APP- +# NAME is deprecated in I, and will be removed in J. (boolean +# value) #use_syslog_rfc_format=false -# Syslog facility to receive log lines (string value) +# Syslog facility to receive log lines. (string value) #syslog_log_facility=LOG_USER + +# +# Options defined in rally.openstack.common.periodic_task +# + +# Some periodic tasks can be run in a separate process. Should +# we run them here? (boolean value) +#run_external_periodic_tasks=true + # # Options defined in rally.osclients # @@ -308,26 +334,30 @@ [database] # -# Options defined in rally.openstack.common.db.options +# Options defined in oslo.db # -# The file name to use with SQLite (string value) -#sqlite_db=rally.sqlite +# The file name to use with SQLite. (string value) +#sqlite_db=oslo.sqlite -# If True, SQLite uses synchronous mode (boolean value) +# If True, SQLite uses synchronous mode. (boolean value) #sqlite_synchronous=true -# The backend to use for db (string value) +# The back end to use for the database. (string value) # Deprecated group/name - [DEFAULT]/db_backend #backend=sqlalchemy -# The SQLAlchemy connection string used to connect to the -# database (string value) +# The SQLAlchemy connection string to use to connect to the +# database. (string value) # Deprecated group/name - [DEFAULT]/sql_connection # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection #connection= +# The SQLAlchemy connection string to use to connect to the +# slave database. (string value) +#slave_connection= + # The SQL mode to be used for MySQL sessions. This option, # including the default, overrides any server-set SQL mode. To # use whatever SQL mode is set by the server configuration, @@ -335,75 +365,76 @@ # value) #mysql_sql_mode=TRADITIONAL -# Timeout before idle sql connections are reaped (integer +# Timeout before idle SQL connections are reaped. (integer # value) # Deprecated group/name - [DEFAULT]/sql_idle_timeout # Deprecated group/name - [DATABASE]/sql_idle_timeout # Deprecated group/name - [sql]/idle_timeout #idle_timeout=3600 -# Minimum number of SQL connections to keep open in a pool +# Minimum number of SQL connections to keep open in a pool. # (integer value) # Deprecated group/name - [DEFAULT]/sql_min_pool_size # Deprecated group/name - [DATABASE]/sql_min_pool_size #min_pool_size=1 -# Maximum number of SQL connections to keep open in a pool +# Maximum number of SQL connections to keep open in a pool. # (integer value) # Deprecated group/name - [DEFAULT]/sql_max_pool_size # Deprecated group/name - [DATABASE]/sql_max_pool_size #max_pool_size= -# Maximum db connection retries during startup. (setting -1 -# implies an infinite retry count) (integer value) +# Maximum db connection retries during startup. Set to -1 to +# specify an infinite retry count. (integer value) # Deprecated group/name - [DEFAULT]/sql_max_retries # Deprecated group/name - [DATABASE]/sql_max_retries #max_retries=10 -# Interval between retries of opening a sql connection +# Interval between retries of opening a SQL connection. # (integer value) # Deprecated group/name - [DEFAULT]/sql_retry_interval # Deprecated group/name - [DATABASE]/reconnect_interval #retry_interval=10 -# If set, use this value for max_overflow with sqlalchemy +# If set, use this value for max_overflow with SQLAlchemy. # (integer value) # Deprecated group/name - [DEFAULT]/sql_max_overflow # Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow #max_overflow= -# Verbosity of SQL debugging information. 0=None, -# 100=Everything (integer value) +# Verbosity of SQL debugging information: 0=None, +# 100=Everything. (integer value) # Deprecated group/name - [DEFAULT]/sql_connection_debug #connection_debug=0 -# Add python stack traces to SQL as comment strings (boolean +# Add Python stack traces to SQL as comment strings. (boolean # value) # Deprecated group/name - [DEFAULT]/sql_connection_trace #connection_trace=false -# If set, use this value for pool_timeout with sqlalchemy +# If set, use this value for pool_timeout with SQLAlchemy. # (integer value) # Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout #pool_timeout= # Enable the experimental use of database reconnect on -# connection lost (boolean value) +# connection lost. (boolean value) #use_db_reconnect=false -# seconds between db connection retries (integer value) +# Seconds between database connection retries. (integer value) #db_retry_interval=1 -# Whether to increase interval between db connection retries, -# up to db_max_retry_interval (boolean value) +# If True, increases the interval between database connection +# retries up to db_max_retry_interval. (boolean value) #db_inc_retry_interval=true -# max seconds between db connection retries, if -# db_inc_retry_interval is enabled (integer value) +# If db_inc_retry_interval is set, the maximum seconds between +# database connection retries. (integer value) #db_max_retry_interval=10 -# maximum db connection retries before error is raised. -# (setting -1 implies an infinite retry count) (integer value) +# Maximum database connection retries before error is raised. +# Set to -1 to specify an infinite retry count. (integer +# value) #db_max_retries=20 diff --git a/requirements.txt b/requirements.txt index 9ab2e61d..40780790 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,7 @@ iso8601>=0.1.9 jsonschema>=2.0.0,<3.0.0 netaddr>=0.7.6 oslo.config>=1.2.1 +oslo.db>=0.2.0 paramiko>=1.13.0 pbr>=0.6,!=0.7,<1.0 pecan>=0.4.5