From ca5cdb59e136a54862f8132bc5b3f9867ae44390 Mon Sep 17 00:00:00 2001 From: Boris Pavlovic Date: Tue, 12 Jan 2016 16:54:29 -0800 Subject: [PATCH] Fix the wrong options in glance-api and glance-registry confs OSprofiler arguments do not have "profiler" group which makes these config files wrong. However they are used by DevStack, so this patch updates them using: tox -e genconfig Change-Id: Ia18ec3e7b2e94d0a0ba6cb8562a0b457fb5ef406 --- etc/glance-api.conf | 715 ++++++++++++++++++++------------------- etc/glance-registry.conf | 568 ++++++++++++++++--------------- 2 files changed, 665 insertions(+), 618 deletions(-) diff --git a/etc/glance-api.conf b/etc/glance-api.conf index 36669addf9..f5050c7485 100644 --- a/etc/glance-api.conf +++ b/etc/glance-api.conf @@ -67,8 +67,8 @@ # For example, if using the file system store a URL of # "file:///path/to/image" will be returned to the user in the # 'direct_url' meta-data field. Revealing storage location can be a -# security risk, so use this setting with caution! The overrides -# show_image_direct_url. (boolean value) +# security risk, so use this setting with caution! Setting this to +# true overrides the show_image_direct_url option. (boolean value) #show_multiple_locations = false # Maximum size of image a user can upload in bytes. Defaults to @@ -108,7 +108,7 @@ #pydev_worker_debug_host = # The port on which a pydev process is listening for connections. -# (integer value) +# (port value) # Minimum value: 1 # Maximum value: 65535 #pydev_worker_debug_port = 5678 @@ -146,13 +146,13 @@ # Modules of exceptions that are permitted to be recreated upon # receiving exception data from an rpc call. (list value) -#allowed_rpc_exception_modules = glance.common.exception,exceptions +#allowed_rpc_exception_modules = glance.common.exception,builtins,exceptions # Address to bind the server. Useful when selecting a particular # network interface. (string value) #bind_host = 0.0.0.0 -# The port on which the server will listen. (integer value) +# The port on which the server will listen. (port value) # Minimum value: 1 # Maximum value: 65535 #bind_port = @@ -160,7 +160,7 @@ # The number of child process workers that will be created to service # requests. The default will be equal to the number of CPUs available. # (integer value) -#workers = 4 +#workers = 8 # Maximum line size of message headers to be accepted. max_header_line # may need to be increased when using large tokens (typically those @@ -202,12 +202,6 @@ # value) #key_file = -# If False fully disable profiling feature. (boolean value) -#enabled = false - -# If False doesn't trace SQL requests. (boolean value) -#trace_sqlalchemy = false - # The path to the sqlite file database that will be used for image # cache management. (string value) #image_cache_sqlite_db = cache.db @@ -242,7 +236,7 @@ # Address to find the registry server. (string value) #registry_host = 0.0.0.0 -# Port the registry server is listening on. (integer value) +# Port the registry server is listening on. (port value) # Minimum value: 1 # Maximum value: 65535 #registry_port = 9191 @@ -365,47 +359,62 @@ # 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) +# Note that when logging configuration files are used then all logging +# configuration is set in the configuration file and other logging +# configuration options are ignored (for example, log_format). (string +# value) # Deprecated group/name - [DEFAULT]/log_config #log_config_append = # 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. (string value) +# logging_default_format_string instead. This option is ignored if +# log_config_append is set. (string value) #log_format = # Format string for %%(asctime)s in log records. Default: %(default)s -# . (string value) +# . This option is ignored if log_config_append is set. (string value) #log_date_format = %Y-%m-%d %H:%M:%S # (Optional) Name of log file to output to. If no default is set, -# logging will go to stdout. (string value) +# logging will go to stdout. This option is ignored if +# log_config_append is set. (string value) # Deprecated group/name - [DEFAULT]/logfile #log_file = # (Optional) The base directory used for relative --log-file paths. -# (string value) +# This option is ignored if log_config_append is set. (string value) # Deprecated group/name - [DEFAULT]/logdir #log_dir = +# (Optional) Uses logging handler designed to watch file system. When +# log file is moved or removed this handler will open a new log file +# with specified path instantaneously. It makes sense only if log-file +# option is specified and Linux platform is used. This option is +# ignored if log_config_append is set. (boolean value) +#watch_log_file = false + # Use syslog for logging. Existing syslog format is DEPRECATED and -# will be changed later to honor RFC5424. (boolean value) +# will be changed later to honor RFC5424. This option is ignored if +# log_config_append is set. (boolean value) #use_syslog = false # (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 Kilo, -# and will be removed in Mitaka, along with this option. (boolean -# value) +# and will be removed in Mitaka, along with this option. This option +# is ignored if log_config_append is set. (boolean value) # This option is deprecated for removal. # Its value may be silently ignored in the future. #use_syslog_rfc_format = true -# Syslog facility to receive log lines. (string value) +# Syslog facility to receive log lines. This option is ignored if +# log_config_append is set. (string value) #syslog_log_facility = LOG_USER -# Log output to standard error. (boolean value) +# Log output to standard error. This option is ignored if +# log_config_append is set. (boolean value) #use_stderr = true # Format string to use for log messages with context. (string value) @@ -422,8 +431,9 @@ # value) #logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s -# 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,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN +# List of logger=LEVEL pairs. This option is ignored if +# log_config_append is set. (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,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN,keystoneauth=WARN # Enables or disables publication of error events. (boolean value) #publish_errors = false @@ -436,6 +446,10 @@ # (string value) #instance_uuid_format = "[instance: %(uuid)s] " +# Format string for user_identity field of the +# logging_context_format_string (string value) +#logging_user_identity_format = %(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s + # Enables or disables fatal status of deprecations. (boolean value) #fatal_deprecations = false @@ -453,10 +467,11 @@ #rpc_zmq_bind_address = * # MatchMaker driver. (string value) -#rpc_zmq_matchmaker = local +#rpc_zmq_matchmaker = redis -# ZeroMQ receiver listening port. (integer value) -#rpc_zmq_port = 9501 +# Type of concurrency used. Either "native" or "eventlet" (string +# value) +#rpc_zmq_concurrency = eventlet # Number of ZeroMQ contexts, defaults to 1. (integer value) #rpc_zmq_contexts = 1 @@ -476,11 +491,42 @@ # impl_zmq. (integer value) #rpc_cast_timeout = 30 -# Heartbeat frequency. (integer value) -#matchmaker_heartbeat_freq = 300 +# The default number of seconds that poll should wait. Poll raises +# timeout exception when timeout expired. (integer value) +#rpc_poll_timeout = 1 -# Heartbeat time-to-live. (integer value) -#matchmaker_heartbeat_ttl = 600 +# Configures zmq-messaging to use proxy with non PUB/SUB patterns. +# (boolean value) +#direct_over_proxy = true + +# Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy. +# (boolean value) +#use_pub_sub = true + +# Minimal port number for random ports range. (port value) +# Minimum value: 1 +# Maximum value: 65535 +#rpc_zmq_min_port = 49152 + +# Maximal port number for random ports range. (integer value) +# Minimum value: 1 +# Maximum value: 65536 +#rpc_zmq_max_port = 65536 + +# Number of retries to find free port number before fail with +# ZMQBindError. (integer value) +#rpc_zmq_bind_port_retries = 100 + +# Host to locate redis. (string value) +#host = 127.0.0.1 + +# Use this port to connect to redis host. (port value) +# Minimum value: 1 +# Maximum value: 65535 +#port = 6379 + +# Password for Redis server (optional). (string value) +#password = # Size of executor thread pool. (integer value) # Deprecated group/name - [DEFAULT]/rpc_thread_pool_size @@ -488,11 +534,19 @@ # The Drivers(s) to handle sending notifications. Possible values are # messaging, messagingv2, routing, log, test, noop (multi valued) -#notification_driver = +# Deprecated group/name - [DEFAULT]/notification_driver +#driver = + +# A URL representing the messaging driver to use for notifications. If +# not set, we fall back to the same configuration used for RPC. +# (string value) +# Deprecated group/name - [DEFAULT]/notification_transport_url +#transport_url = # AMQP topic used for OpenStack notifications. (list value) # Deprecated group/name - [rpc_notifier2]/topics -#notification_topics = notifications +# Deprecated group/name - [DEFAULT]/notification_topics +#topics = notifications # Seconds to wait for a response from a call. (integer value) #rpc_response_timeout = 60 @@ -503,7 +557,7 @@ #transport_url = # The messaging driver to use, defaults to rabbit. Other drivers -# include qpid and zmq. (string value) +# include amqp and zmq. (string value) #rpc_backend = rabbit # The default exchange under which topics are scoped. May be @@ -512,6 +566,66 @@ #control_exchange = openstack +[cors] + +# +# From oslo.middleware.cors +# + +# Indicate whether this resource may be shared with the domain +# received in the requests "origin" header. (list value) +#allowed_origin = + +# Indicate that the actual request can include user credentials +# (boolean value) +#allow_credentials = true + +# Indicate which headers are safe to expose to the API. Defaults to +# HTTP Simple Headers. (list value) +#expose_headers = Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma + +# Maximum cache age of CORS preflight requests. (integer value) +#max_age = 3600 + +# Indicate which methods can be used during the actual request. (list +# value) +#allow_methods = GET,POST,PUT,DELETE,OPTIONS + +# Indicate which header field names may be used during the actual +# request. (list value) +#allow_headers = Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma + + +[cors.subdomain] + +# +# From oslo.middleware.cors +# + +# Indicate whether this resource may be shared with the domain +# received in the requests "origin" header. (list value) +#allowed_origin = + +# Indicate that the actual request can include user credentials +# (boolean value) +#allow_credentials = true + +# Indicate which headers are safe to expose to the API. Defaults to +# HTTP Simple Headers. (list value) +#expose_headers = Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma + +# Maximum cache age of CORS preflight requests. (integer value) +#max_age = 3600 + +# Indicate which methods can be used during the actual request. (list +# value) +#allow_methods = GET,POST,PUT,DELETE,OPTIONS + +# Indicate which header field names may be used during the actual +# request. (list value) +#allow_headers = Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma + + [database] # @@ -627,65 +741,6 @@ #use_tpool = false -[cors] - -# -# From oslo.middleware.cors -# - -# Indicate whether this resource may be shared with the domain -# received in the requests "origin" header. (string value) -#allowed_origin = - -# Indicate that the actual request can include user credentials -# (boolean value) -#allow_credentials = true - -# Indicate which headers are safe to expose to the API. Defaults to -# HTTP Simple Headers. (list value) -#expose_headers = Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma - -# Maximum cache age of CORS preflight requests. (integer value) -#max_age = 3600 - -# Indicate which methods can be used during the actual request. (list -# value) -#allow_methods = GET,POST,PUT,DELETE,OPTIONS - -# Indicate which header field names may be used during the actual -# request. (list value) -#allow_headers = Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma - - -[cors.subdomain] - -# -# From oslo.middleware.cors -# - -# Indicate whether this resource may be shared with the domain -# received in the requests "origin" header. (string value) -#allowed_origin = - -# Indicate that the actual request can include user credentials -# (boolean value) -#allow_credentials = true - -# Indicate which headers are safe to expose to the API. Defaults to -# HTTP Simple Headers. (list value) -#expose_headers = Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma - -# Maximum cache age of CORS preflight requests. (integer value) -#max_age = 3600 - -# Indicate which methods can be used during the actual request. (list -# value) -#allow_methods = GET,POST,PUT,DELETE,OPTIONS - -# Indicate which header field names may be used during the actual -# request. (list value) -#allow_headers = Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma - [glance_store] # @@ -712,14 +767,87 @@ # From glance.store # -# Hostname or IP address of the instance to connect to, or a mongodb -# URI, or a list of hostnames / mongodb URIs. If host is an IPv6 -# literal it must be enclosed in '[' and ']' characters following the -# RFC2732 URL syntax (e.g. '[::1]' for localhost) (string value) -#mongodb_store_uri = +# Directory to which the Filesystem backend store writes images. +# (string value) +#filesystem_store_datadir = -# Database to use (string value) -#mongodb_store_db = +# List of directories and its priorities to which the Filesystem +# backend store writes images. (multi valued) +#filesystem_store_datadirs = + +# The path to a file which contains the metadata to be returned with +# any location associated with this store. The file must contain a +# valid JSON object. The object should contain the keys 'id' and +# 'mountpoint'. The value for both keys should be 'string'. (string +# value) +#filesystem_store_metadata_file = + +# The required permission for created image file. In this way the user +# other service used, e.g. Nova, who consumes the image could be the +# exclusive member of the group that owns the files created. Assigning +# it less then or equal to zero means don't change the default +# permission of the file. This value will be decoded as an octal +# digit. (integer value) +#filesystem_store_file_perm = 0 + +# ESX/ESXi or vCenter Server target system. The server value can be an +# IP address or a DNS name. (string value) +#vmware_server_host = + +# Username for authenticating with VMware ESX/VC server. (string +# value) +#vmware_server_username = + +# Password for authenticating with VMware ESX/VC server. (string +# value) +#vmware_server_password = + +# DEPRECATED. Inventory path to a datacenter. If the +# vmware_server_host specified is an ESX/ESXi, the +# vmware_datacenter_path is optional. If specified, it should be "ha- +# datacenter". This option is deprecated in favor of vmware_datastores +# and will be removed in the Liberty release. (string value) +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +#vmware_datacenter_path = ha-datacenter + +# DEPRECATED. Datastore associated with the datacenter. This option is +# deprecated in favor of vmware_datastores and will be removed in the +# Liberty release. (string value) +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +#vmware_datastore_name = + +# Number of times VMware ESX/VC server API must be retried upon +# connection related issues. (integer value) +#vmware_api_retry_count = 10 + +# The interval used for polling remote tasks invoked on VMware ESX/VC +# server. (integer value) +#vmware_task_poll_interval = 5 + +# The name of the directory where the glance images will be stored in +# the VMware datastore. (string value) +#vmware_store_image_dir = /openstack_glance + +# Allow to perform insecure SSL requests to ESX/VC. (boolean value) +#vmware_api_insecure = false + +# A list of datastores where the image can be stored. This option may +# be specified multiple times for specifying multiple datastores. +# Either one of vmware_datastore_name or vmware_datastores is +# required. The datastore name should be specified after its +# datacenter path, seperated by ":". An optional weight may be given +# after the datastore name, seperated again by ":". Thus, the required +# format becomes ::. +# When adding an image, the datastore with highest weight will be +# selected, unless there is not enough free space available in cases +# where the image size is already known. If no weight is given, it is +# assumed to be zero and the directory will be considered for +# selection last. If multiple datastores have the same weight, then +# the one with the most free space available is selected. (multi +# valued) +#vmware_datastores = # Images will be chunked into objects of this size (in megabytes). For # best performance, this should be a power of two. (integer value) @@ -755,28 +883,79 @@ # (integer value) #rados_connect_timeout = 0 -# Directory to which the Filesystem backend store writes images. +# The host where the S3 server is listening. (string value) +#s3_store_host = + +# The S3 query token access key. (string value) +#s3_store_access_key = + +# The S3 query token secret key. (string value) +#s3_store_secret_key = + +# The S3 bucket to be used to store the Glance data. (string value) +#s3_store_bucket = + +# The local directory where uploads will be staged before they are +# transferred into S3. (string value) +#s3_store_object_buffer_dir = + +# A boolean to determine if the S3 bucket should be created on upload +# if it does not exist or if an error should be returned to the user. +# (boolean value) +#s3_store_create_bucket_on_put = false + +# The S3 calling format used to determine the bucket. Either subdomain +# or path can be used. (string value) +#s3_store_bucket_url_format = subdomain + +# What size, in MB, should S3 start chunking image files and do a +# multipart upload in S3. (integer value) +#s3_store_large_object_size = 100 + +# What multipart upload part size, in MB, should S3 use when uploading +# parts. The size must be greater than or equal to 5M. (integer value) +#s3_store_large_object_chunk_size = 10 + +# The number of thread pools to perform a multipart upload in S3. +# (integer value) +#s3_store_thread_pools = 10 + +# Enable the use of a proxy. (boolean value) +#s3_store_enable_proxy = false + +# Address or hostname for the proxy server. (string value) +#s3_store_proxy_host = + +# The port to use when connecting over a proxy. (integer value) +#s3_store_proxy_port = 8080 + +# The username to connect to the proxy. (string value) +#s3_store_proxy_user = + +# The password to use when connecting over a proxy. (string value) +#s3_store_proxy_password = + +# Info to match when looking for cinder in the service catalog. Format +# is : separated values of the form: +# :: (string value) +#cinder_catalog_info = volume:cinder:publicURL + +# Override service catalog lookup with template for cinder endpoint +# e.g. http://localhost:8776/v1/%(project_id)s (string value) +#cinder_endpoint_template = + +# Region name of this node (string value) +#os_region_name = + +# Location of ca certicates file to use for cinder client requests. # (string value) -#filesystem_store_datadir = +#cinder_ca_certificates_file = -# List of directories and its priorities to which the Filesystem -# backend store writes images. (multi valued) -#filesystem_store_datadirs = +# Number of cinderclient retries on failed http calls (integer value) +#cinder_http_retries = 3 -# The path to a file which contains the metadata to be returned with -# any location associated with this store. The file must contain a -# valid JSON object. The object should contain the keys 'id' and -# 'mountpoint'. The value for both keys should be 'string'. (string -# value) -#filesystem_store_metadata_file = - -# The required permission for created image file. In this way the user -# other service used, e.g. Nova, who consumes the image could be the -# exclusive member of the group that owns the files created. Assigning -# it less then or equal to zero means don't change the default -# permission of the file. This value will be decoded as an octal -# digit. (integer value) -#filesystem_store_file_perm = 0 +# Allow to perform insecure SSL requests to cinder (boolean value) +#cinder_api_insecure = false # If True, swiftclient won't check for a valid SSL certificate when # authenticating. (boolean value) @@ -879,138 +1058,14 @@ # The config file that has the swift account(s)configs. (string value) #swift_store_config_file = -# ESX/ESXi or vCenter Server target system. The server value can be an -# IP address or a DNS name. (string value) -#vmware_server_host = +# Hostname or IP address of the instance to connect to, or a mongodb +# URI, or a list of hostnames / mongodb URIs. If host is an IPv6 +# literal it must be enclosed in '[' and ']' characters following the +# RFC2732 URL syntax (e.g. '[::1]' for localhost) (string value) +#mongodb_store_uri = -# Username for authenticating with VMware ESX/VC server. (string -# value) -#vmware_server_username = - -# Password for authenticating with VMware ESX/VC server. (string -# value) -#vmware_server_password = - -# DEPRECATED. Inventory path to a datacenter. If the -# vmware_server_host specified is an ESX/ESXi, the -# vmware_datacenter_path is optional. If specified, it should be "ha- -# datacenter". This option is deprecated in favor of vmware_datastores -# and will be removed in the Liberty release. (string value) -# This option is deprecated for removal. -# Its value may be silently ignored in the future. -#vmware_datacenter_path = ha-datacenter - -# DEPRECATED. Datastore associated with the datacenter. This option is -# deprecated in favor of vmware_datastores and will be removed in the -# Liberty release. (string value) -# This option is deprecated for removal. -# Its value may be silently ignored in the future. -#vmware_datastore_name = - -# Number of times VMware ESX/VC server API must be retried upon -# connection related issues. (integer value) -#vmware_api_retry_count = 10 - -# The interval used for polling remote tasks invoked on VMware ESX/VC -# server. (integer value) -#vmware_task_poll_interval = 5 - -# The name of the directory where the glance images will be stored in -# the VMware datastore. (string value) -#vmware_store_image_dir = /openstack_glance - -# Allow to perform insecure SSL requests to ESX/VC. (boolean value) -#vmware_api_insecure = false - -# A list of datastores where the image can be stored. This option may -# be specified multiple times for specifying multiple datastores. -# Either one of vmware_datastore_name or vmware_datastores is -# required. The datastore name should be specified after its -# datacenter path, seperated by ":". An optional weight may be given -# after the datastore name, seperated again by ":". Thus, the required -# format becomes ::. -# When adding an image, the datastore with highest weight will be -# selected, unless there is not enough free space available in cases -# where the image size is already known. If no weight is given, it is -# assumed to be zero and the directory will be considered for -# selection last. If multiple datastores have the same weight, then -# the one with the most free space available is selected. (multi -# valued) -#vmware_datastores = - -# The host where the S3 server is listening. (string value) -#s3_store_host = - -# The S3 query token access key. (string value) -#s3_store_access_key = - -# The S3 query token secret key. (string value) -#s3_store_secret_key = - -# The S3 bucket to be used to store the Glance data. (string value) -#s3_store_bucket = - -# The local directory where uploads will be staged before they are -# transferred into S3. (string value) -#s3_store_object_buffer_dir = - -# A boolean to determine if the S3 bucket should be created on upload -# if it does not exist or if an error should be returned to the user. -# (boolean value) -#s3_store_create_bucket_on_put = false - -# The S3 calling format used to determine the bucket. Either subdomain -# or path can be used. (string value) -#s3_store_bucket_url_format = subdomain - -# What size, in MB, should S3 start chunking image files and do a -# multipart upload in S3. (integer value) -#s3_store_large_object_size = 100 - -# What multipart upload part size, in MB, should S3 use when uploading -# parts. The size must be greater than or equal to 5M. (integer value) -#s3_store_large_object_chunk_size = 10 - -# The number of thread pools to perform a multipart upload in S3. -# (integer value) -#s3_store_thread_pools = 10 - -# Enable the use of a proxy. (boolean value) -#s3_store_enable_proxy = false - -# Address or hostname for the proxy server. (string value) -#s3_store_proxy_host = - -# The port to use when connecting over a proxy. (integer value) -#s3_store_proxy_port = 8080 - -# The username to connect to the proxy. (string value) -#s3_store_proxy_user = - -# The password to use when connecting over a proxy. (string value) -#s3_store_proxy_password = - -# Info to match when looking for cinder in the service catalog. Format -# is : separated values of the form: -# :: (string value) -#cinder_catalog_info = volume:cinder:publicURL - -# Override service catalog lookup with template for cinder endpoint -# e.g. http://localhost:8776/v1/%(project_id)s (string value) -#cinder_endpoint_template = - -# Region name of this node (string value) -#os_region_name = - -# Location of ca certicates file to use for cinder client requests. -# (string value) -#cinder_ca_certificates_file = - -# Number of cinderclient retries on failed http calls (integer value) -#cinder_http_retries = 3 - -# Allow to perform insecure SSL requests to cinder (boolean value) -#cinder_api_insecure = false +# Database to use (string value) +#mongodb_store_db = [image_format] @@ -1200,6 +1255,14 @@ # Service tenant name. (string value) #admin_tenant_name = admin +# Authentication type to load (unknown value) +# Deprecated group/name - [DEFAULT]/auth_plugin +#auth_type = + +# Config Section from which to load plugin specific options (unknown +# value) +#auth_section = + [matchmaker_redis] @@ -1210,22 +1273,13 @@ # Host to locate redis. (string value) #host = 127.0.0.1 -# Use this port to connect to redis host. (integer value) +# Use this port to connect to redis host. (port value) +# Minimum value: 1 +# Maximum value: 65535 #port = 6379 # Password for Redis server (optional). (string value) -#password = - - -[matchmaker_ring] - -# -# From oslo.messaging -# - -# Matchmaker ring file (JSON). (string value) -# Deprecated group/name - [DEFAULT]/matchmaker_ringfile -#ringfile = /etc/oslo/matchmaker_ring.json +#password = [oslo_concurrency] @@ -1298,81 +1352,26 @@ # Deprecated group/name - [amqp1]/allow_insecure_clients #allow_insecure_clients = false +# Space separated list of acceptable SASL mechanisms (string value) +# Deprecated group/name - [amqp1]/sasl_mechanisms +#sasl_mechanisms = -[oslo_messaging_qpid] - -# -# From oslo.messaging -# - -# Use durable queues in AMQP. (boolean value) -# Deprecated group/name - [DEFAULT]/amqp_durable_queues -# Deprecated group/name - [DEFAULT]/rabbit_durable_queues -#amqp_durable_queues = false - -# Auto-delete queues in AMQP. (boolean value) -# Deprecated group/name - [DEFAULT]/amqp_auto_delete -#amqp_auto_delete = false - -# Send a single AMQP reply to call message. The current behaviour -# since oslo-incubator is to send two AMQP replies - first one with -# the payload, a second one to ensure the other have finish to send -# the payload. We are going to remove it in the N release, but we must -# keep backward compatible at the same time. This option provides such -# compatibility - it defaults to False in Liberty and can be turned on -# for early adopters with a new installations or for testing. Please -# note, that this option will be removed in the Mitaka release. -# (boolean value) -#send_single_reply = false - -# Qpid broker hostname. (string value) -# Deprecated group/name - [DEFAULT]/qpid_hostname -#qpid_hostname = localhost - -# Qpid broker port. (integer value) -# Deprecated group/name - [DEFAULT]/qpid_port -#qpid_port = 5672 - -# Qpid HA cluster host:port pairs. (list value) -# Deprecated group/name - [DEFAULT]/qpid_hosts -#qpid_hosts = $qpid_hostname:$qpid_port - -# Username for Qpid connection. (string value) -# Deprecated group/name - [DEFAULT]/qpid_username -#qpid_username = - -# Password for Qpid connection. (string value) -# Deprecated group/name - [DEFAULT]/qpid_password -#qpid_password = - -# Space separated list of SASL mechanisms to use for auth. (string +# Path to directory that contains the SASL configuration (string # value) -# Deprecated group/name - [DEFAULT]/qpid_sasl_mechanisms -#qpid_sasl_mechanisms = +# Deprecated group/name - [amqp1]/sasl_config_dir +#sasl_config_dir = -# Seconds between connection keepalive heartbeats. (integer value) -# Deprecated group/name - [DEFAULT]/qpid_heartbeat -#qpid_heartbeat = 60 +# Name of configuration file (without .conf suffix) (string value) +# Deprecated group/name - [amqp1]/sasl_config_name +#sasl_config_name = -# Transport to use, either 'tcp' or 'ssl'. (string value) -# Deprecated group/name - [DEFAULT]/qpid_protocol -#qpid_protocol = tcp +# User name for message broker authentication (string value) +# Deprecated group/name - [amqp1]/username +#username = -# Whether to disable the Nagle algorithm. (boolean value) -# Deprecated group/name - [DEFAULT]/qpid_tcp_nodelay -#qpid_tcp_nodelay = true - -# The number of prefetched messages held by receiver. (integer value) -# Deprecated group/name - [DEFAULT]/qpid_receiver_capacity -#qpid_receiver_capacity = 1 - -# The qpid topology version to use. Version 1 is what was originally -# used by impl_qpid. Version 2 includes some backwards-incompatible -# changes that allow broker federation to work. Users should update -# to version 2 when they are able to take everything down, as it -# requires a clean break. (integer value) -# Deprecated group/name - [DEFAULT]/qpid_topology_version -#qpid_topology_version = 1 +# Password for message broker authentication (string value) +# Deprecated group/name - [amqp1]/password +#password = [oslo_messaging_rabbit] @@ -1390,17 +1389,6 @@ # Deprecated group/name - [DEFAULT]/amqp_auto_delete #amqp_auto_delete = false -# Send a single AMQP reply to call message. The current behaviour -# since oslo-incubator is to send two AMQP replies - first one with -# the payload, a second one to ensure the other have finish to send -# the payload. We are going to remove it in the N release, but we must -# keep backward compatible at the same time. This option provides such -# compatibility - it defaults to False in Liberty and can be turned on -# for early adopters with a new installations or for testing. Please -# note, that this option will be removed in the Mitaka release. -# (boolean value) -#send_single_reply = false - # SSL version to use (valid only if SSL enabled). Valid values are # TLSv1 and SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be # available on some distributions. (string value) @@ -1425,18 +1413,26 @@ # Deprecated group/name - [DEFAULT]/kombu_reconnect_delay #kombu_reconnect_delay = 1.0 -# How long to wait before considering a reconnect attempt to have -# failed. This value should not be longer than rpc_response_timeout. +# How long to wait a missing client beforce abandoning to send it its +# replies. This value should not be longer than rpc_response_timeout. # (integer value) -#kombu_reconnect_timeout = 60 +# Deprecated group/name - [DEFAULT]/kombu_reconnect_timeout +#kombu_missing_consumer_retry_timeout = 60 + +# Determines how the next RabbitMQ node is chosen in case the one we +# are currently connected to becomes unavailable. Takes effect only if +# more than one RabbitMQ node is provided in config. (string value) +# Allowed values: round-robin, shuffle +#kombu_failover_strategy = round-robin # The RabbitMQ broker address where a single node is used. (string # value) # Deprecated group/name - [DEFAULT]/rabbit_host #rabbit_host = localhost -# The RabbitMQ broker port where a single node is used. (integer -# value) +# The RabbitMQ broker port where a single node is used. (port value) +# Minimum value: 1 +# Maximum value: 65535 # Deprecated group/name - [DEFAULT]/rabbit_port #rabbit_port = 5672 @@ -1518,8 +1514,6 @@ # policy_file must exist for these directories to be searched. # Missing or empty directories are ignored. (multi valued) # Deprecated group/name - [DEFAULT]/policy_dirs -# This option is deprecated for removal. -# Its value may be silently ignored in the future. #policy_dirs = policy.d @@ -1539,6 +1533,23 @@ #config_file = +[profiler] + +# +# From glance.api +# + +# If False fully disable profiling feature. (boolean value) +#enabled = false + +# If False doesn't trace SQL requests. (boolean value) +#trace_sqlalchemy = false + +# Secret key to use to sign Glance API and Glance Registry services +# tracing messages. (string value) +#hmac_keys = SECRET_KEY + + [store_type_location_strategy] # diff --git a/etc/glance-registry.conf b/etc/glance-registry.conf index b40dc5a43f..54595d2e9d 100644 --- a/etc/glance-registry.conf +++ b/etc/glance-registry.conf @@ -61,8 +61,8 @@ # For example, if using the file system store a URL of # "file:///path/to/image" will be returned to the user in the # 'direct_url' meta-data field. Revealing storage location can be a -# security risk, so use this setting with caution! The overrides -# show_image_direct_url. (boolean value) +# security risk, so use this setting with caution! Setting this to +# true overrides the show_image_direct_url option. (boolean value) #show_multiple_locations = false # Maximum size of image a user can upload in bytes. Defaults to @@ -102,7 +102,7 @@ #pydev_worker_debug_host = # The port on which a pydev process is listening for connections. -# (integer value) +# (port value) # Minimum value: 1 # Maximum value: 65535 #pydev_worker_debug_port = 5678 @@ -123,7 +123,7 @@ # network interface. (string value) #bind_host = 0.0.0.0 -# The port on which the server will listen. (integer value) +# The port on which the server will listen. (port value) # Minimum value: 1 # Maximum value: 65535 #bind_port = @@ -152,7 +152,7 @@ # The number of child process workers that will be created to service # requests. The default will be equal to the number of CPUs available. # (integer value) -#workers = 4 +#workers = 8 # Maximum line size of message headers to be accepted. max_header_line # may need to be increased when using large tokens (typically those @@ -190,47 +190,62 @@ # 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) +# Note that when logging configuration files are used then all logging +# configuration is set in the configuration file and other logging +# configuration options are ignored (for example, log_format). (string +# value) # Deprecated group/name - [DEFAULT]/log_config #log_config_append = # 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. (string value) +# logging_default_format_string instead. This option is ignored if +# log_config_append is set. (string value) #log_format = # Format string for %%(asctime)s in log records. Default: %(default)s -# . (string value) +# . This option is ignored if log_config_append is set. (string value) #log_date_format = %Y-%m-%d %H:%M:%S # (Optional) Name of log file to output to. If no default is set, -# logging will go to stdout. (string value) +# logging will go to stdout. This option is ignored if +# log_config_append is set. (string value) # Deprecated group/name - [DEFAULT]/logfile #log_file = # (Optional) The base directory used for relative --log-file paths. -# (string value) +# This option is ignored if log_config_append is set. (string value) # Deprecated group/name - [DEFAULT]/logdir #log_dir = +# (Optional) Uses logging handler designed to watch file system. When +# log file is moved or removed this handler will open a new log file +# with specified path instantaneously. It makes sense only if log-file +# option is specified and Linux platform is used. This option is +# ignored if log_config_append is set. (boolean value) +#watch_log_file = false + # Use syslog for logging. Existing syslog format is DEPRECATED and -# will be changed later to honor RFC5424. (boolean value) +# will be changed later to honor RFC5424. This option is ignored if +# log_config_append is set. (boolean value) #use_syslog = false # (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 Kilo, -# and will be removed in Mitaka, along with this option. (boolean -# value) +# and will be removed in Mitaka, along with this option. This option +# is ignored if log_config_append is set. (boolean value) # This option is deprecated for removal. # Its value may be silently ignored in the future. #use_syslog_rfc_format = true -# Syslog facility to receive log lines. (string value) +# Syslog facility to receive log lines. This option is ignored if +# log_config_append is set. (string value) #syslog_log_facility = LOG_USER -# Log output to standard error. (boolean value) +# Log output to standard error. This option is ignored if +# log_config_append is set. (boolean value) #use_stderr = true # Format string to use for log messages with context. (string value) @@ -247,8 +262,9 @@ # value) #logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s -# 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,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN +# List of logger=LEVEL pairs. This option is ignored if +# log_config_append is set. (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,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN,keystoneauth=WARN # Enables or disables publication of error events. (boolean value) #publish_errors = false @@ -261,6 +277,10 @@ # (string value) #instance_uuid_format = "[instance: %(uuid)s] " +# Format string for user_identity field of the +# logging_context_format_string (string value) +#logging_user_identity_format = %(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s + # Enables or disables fatal status of deprecations. (boolean value) #fatal_deprecations = false @@ -278,10 +298,11 @@ #rpc_zmq_bind_address = * # MatchMaker driver. (string value) -#rpc_zmq_matchmaker = local +#rpc_zmq_matchmaker = redis -# ZeroMQ receiver listening port. (integer value) -#rpc_zmq_port = 9501 +# Type of concurrency used. Either "native" or "eventlet" (string +# value) +#rpc_zmq_concurrency = eventlet # Number of ZeroMQ contexts, defaults to 1. (integer value) #rpc_zmq_contexts = 1 @@ -301,11 +322,42 @@ # impl_zmq. (integer value) #rpc_cast_timeout = 30 -# Heartbeat frequency. (integer value) -#matchmaker_heartbeat_freq = 300 +# The default number of seconds that poll should wait. Poll raises +# timeout exception when timeout expired. (integer value) +#rpc_poll_timeout = 1 -# Heartbeat time-to-live. (integer value) -#matchmaker_heartbeat_ttl = 600 +# Configures zmq-messaging to use proxy with non PUB/SUB patterns. +# (boolean value) +#direct_over_proxy = true + +# Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy. +# (boolean value) +#use_pub_sub = true + +# Minimal port number for random ports range. (port value) +# Minimum value: 1 +# Maximum value: 65535 +#rpc_zmq_min_port = 49152 + +# Maximal port number for random ports range. (integer value) +# Minimum value: 1 +# Maximum value: 65536 +#rpc_zmq_max_port = 65536 + +# Number of retries to find free port number before fail with +# ZMQBindError. (integer value) +#rpc_zmq_bind_port_retries = 100 + +# Host to locate redis. (string value) +#host = 127.0.0.1 + +# Use this port to connect to redis host. (port value) +# Minimum value: 1 +# Maximum value: 65535 +#port = 6379 + +# Password for Redis server (optional). (string value) +#password = # Size of executor thread pool. (integer value) # Deprecated group/name - [DEFAULT]/rpc_thread_pool_size @@ -313,11 +365,19 @@ # The Drivers(s) to handle sending notifications. Possible values are # messaging, messagingv2, routing, log, test, noop (multi valued) -#notification_driver = +# Deprecated group/name - [DEFAULT]/notification_driver +#driver = + +# A URL representing the messaging driver to use for notifications. If +# not set, we fall back to the same configuration used for RPC. +# (string value) +# Deprecated group/name - [DEFAULT]/notification_transport_url +#transport_url = # AMQP topic used for OpenStack notifications. (list value) # Deprecated group/name - [rpc_notifier2]/topics -#notification_topics = notifications +# Deprecated group/name - [DEFAULT]/notification_topics +#topics = notifications # Seconds to wait for a response from a call. (integer value) #rpc_response_timeout = 60 @@ -328,7 +388,7 @@ #transport_url = # The messaging driver to use, defaults to rabbit. Other drivers -# include qpid and zmq. (string value) +# include amqp and zmq. (string value) #rpc_backend = rabbit # The default exchange under which topics are scoped. May be @@ -478,144 +538,6 @@ # From glance.store # -# If True, swiftclient won't check for a valid SSL certificate when -# authenticating. (boolean value) -#swift_store_auth_insecure = false - -# A string giving the CA certificate file to use in SSL connections -# for verifying certs. (string value) -#swift_store_cacert = - -# The region of the swift endpoint to be used for single tenant. This -# setting is only necessary if the tenant has multiple swift -# endpoints. (string value) -#swift_store_region = - -# If set, the configured endpoint will be used. If None, the storage -# url from the auth response will be used. (string value) -#swift_store_endpoint = - -# A string giving the endpoint type of the swift service to use -# (publicURL, adminURL or internalURL). This setting is only used if -# swift_store_auth_version is 2. (string value) -#swift_store_endpoint_type = publicURL - -# A string giving the service type of the swift service to use. This -# setting is only used if swift_store_auth_version is 2. (string -# value) -#swift_store_service_type = object-store - -# Container within the account that the account should use for storing -# images in Swift when using single container mode. In multiple -# container mode, this will be the prefix for all containers. (string -# value) -#swift_store_container = glance - -# The size, in MB, that Glance will start chunking image files and do -# a large object manifest in Swift. (integer value) -#swift_store_large_object_size = 5120 - -# The amount of data written to a temporary disk buffer during the -# process of chunking the image file. (integer value) -#swift_store_large_object_chunk_size = 200 - -# A boolean value that determines if we create the container if it -# does not exist. (boolean value) -#swift_store_create_container_on_put = false - -# If set to True, enables multi-tenant storage mode which causes -# Glance images to be stored in tenant specific Swift accounts. -# (boolean value) -#swift_store_multi_tenant = false - -# When set to 0, a single-tenant store will only use one container to -# store all images. When set to an integer value between 1 and 32, a -# single-tenant store will use multiple containers to store images, -# and this value will determine how many containers are created.Used -# only when swift_store_multi_tenant is disabled. The total number of -# containers that will be used is equal to 16^N, so if this config -# option is set to 2, then 16^2=256 containers will be used to store -# images. (integer value) -#swift_store_multiple_containers_seed = 0 - -# A list of tenants that will be granted read/write access on all -# Swift containers created by Glance in multi-tenant mode. (list -# value) -#swift_store_admin_tenants = - -# If set to False, disables SSL layer compression of https swift -# requests. Setting to False may improve performance for images which -# are already in a compressed format, eg qcow2. (boolean value) -#swift_store_ssl_compression = true - -# The number of times a Swift download will be retried before the -# request fails. (integer value) -#swift_store_retry_get_count = 0 - -# The reference to the default swift account/backing store parameters -# to use for adding new images. (string value) -#default_swift_reference = ref1 - -# Version of the authentication service to use. Valid versions are 2 -# and 3 for keystone and 1 (deprecated) for swauth and rackspace. -# (deprecated - use "auth_version" in swift_store_config_file) (string -# value) -#swift_store_auth_version = 2 - -# The address where the Swift authentication service is listening. -# (deprecated - use "auth_address" in swift_store_config_file) (string -# value) -#swift_store_auth_address = - -# The user to authenticate against the Swift authentication service -# (deprecated - use "user" in swift_store_config_file) (string value) -#swift_store_user = - -# Auth key for the user authenticating against the Swift -# authentication service. (deprecated - use "key" in -# swift_store_config_file) (string value) -#swift_store_key = - -# The config file that has the swift account(s)configs. (string value) -#swift_store_config_file = - -# The host where the S3 server is listening. (string value) -#s3_store_host = - -# The S3 query token access key. (string value) -#s3_store_access_key = - -# The S3 query token secret key. (string value) -#s3_store_secret_key = - -# The S3 bucket to be used to store the Glance data. (string value) -#s3_store_bucket = - -# The local directory where uploads will be staged before they are -# transferred into S3. (string value) -#s3_store_object_buffer_dir = - -# A boolean to determine if the S3 bucket should be created on upload -# if it does not exist or if an error should be returned to the user. -# (boolean value) -#s3_store_create_bucket_on_put = false - -# The S3 calling format used to determine the bucket. Either subdomain -# or path can be used. (string value) -#s3_store_bucket_url_format = subdomain - -# What size, in MB, should S3 start chunking image files and do a -# multipart upload in S3. (integer value) -#s3_store_large_object_size = 100 - -# What multipart upload part size, in MB, should S3 use when uploading -# parts. The size must be greater than or equal to 5M. (integer value) -#s3_store_large_object_chunk_size = 10 - -# The number of thread pools to perform a multipart upload in S3. -# (integer value) -#s3_store_thread_pools = 10 - # Directory to which the Filesystem backend store writes images. # (string value) #filesystem_store_datadir = @@ -727,6 +649,63 @@ # (string value) #rbd_store_ceph_conf = /etc/ceph/ceph.conf +# Timeout value (in seconds) used when connecting to ceph cluster. If +# value <= 0, no timeout is set and default librados value is used. +# (integer value) +#rados_connect_timeout = 0 + +# The host where the S3 server is listening. (string value) +#s3_store_host = + +# The S3 query token access key. (string value) +#s3_store_access_key = + +# The S3 query token secret key. (string value) +#s3_store_secret_key = + +# The S3 bucket to be used to store the Glance data. (string value) +#s3_store_bucket = + +# The local directory where uploads will be staged before they are +# transferred into S3. (string value) +#s3_store_object_buffer_dir = + +# A boolean to determine if the S3 bucket should be created on upload +# if it does not exist or if an error should be returned to the user. +# (boolean value) +#s3_store_create_bucket_on_put = false + +# The S3 calling format used to determine the bucket. Either subdomain +# or path can be used. (string value) +#s3_store_bucket_url_format = subdomain + +# What size, in MB, should S3 start chunking image files and do a +# multipart upload in S3. (integer value) +#s3_store_large_object_size = 100 + +# What multipart upload part size, in MB, should S3 use when uploading +# parts. The size must be greater than or equal to 5M. (integer value) +#s3_store_large_object_chunk_size = 10 + +# The number of thread pools to perform a multipart upload in S3. +# (integer value) +#s3_store_thread_pools = 10 + +# Enable the use of a proxy. (boolean value) +#s3_store_enable_proxy = false + +# Address or hostname for the proxy server. (string value) +#s3_store_proxy_host = + +# The port to use when connecting over a proxy. (integer value) +#s3_store_proxy_port = 8080 + +# The username to connect to the proxy. (string value) +#s3_store_proxy_user = + +# The password to use when connecting over a proxy. (string value) +#s3_store_proxy_password = + # Info to match when looking for cinder in the service catalog. Format # is : separated values of the form: # :: (string value) @@ -749,6 +728,107 @@ # Allow to perform insecure SSL requests to cinder (boolean value) #cinder_api_insecure = false +# If True, swiftclient won't check for a valid SSL certificate when +# authenticating. (boolean value) +#swift_store_auth_insecure = false + +# A string giving the CA certificate file to use in SSL connections +# for verifying certs. (string value) +#swift_store_cacert = + +# The region of the swift endpoint to be used for single tenant. This +# setting is only necessary if the tenant has multiple swift +# endpoints. (string value) +#swift_store_region = + +# If set, the configured endpoint will be used. If None, the storage +# url from the auth response will be used. (string value) +#swift_store_endpoint = + +# A string giving the endpoint type of the swift service to use +# (publicURL, adminURL or internalURL). This setting is only used if +# swift_store_auth_version is 2. (string value) +#swift_store_endpoint_type = publicURL + +# A string giving the service type of the swift service to use. This +# setting is only used if swift_store_auth_version is 2. (string +# value) +#swift_store_service_type = object-store + +# Container within the account that the account should use for storing +# images in Swift when using single container mode. In multiple +# container mode, this will be the prefix for all containers. (string +# value) +#swift_store_container = glance + +# The size, in MB, that Glance will start chunking image files and do +# a large object manifest in Swift. (integer value) +#swift_store_large_object_size = 5120 + +# The amount of data written to a temporary disk buffer during the +# process of chunking the image file. (integer value) +#swift_store_large_object_chunk_size = 200 + +# A boolean value that determines if we create the container if it +# does not exist. (boolean value) +#swift_store_create_container_on_put = false + +# If set to True, enables multi-tenant storage mode which causes +# Glance images to be stored in tenant specific Swift accounts. +# (boolean value) +#swift_store_multi_tenant = false + +# When set to 0, a single-tenant store will only use one container to +# store all images. When set to an integer value between 1 and 32, a +# single-tenant store will use multiple containers to store images, +# and this value will determine how many containers are created.Used +# only when swift_store_multi_tenant is disabled. The total number of +# containers that will be used is equal to 16^N, so if this config +# option is set to 2, then 16^2=256 containers will be used to store +# images. (integer value) +#swift_store_multiple_containers_seed = 0 + +# A list of tenants that will be granted read/write access on all +# Swift containers created by Glance in multi-tenant mode. (list +# value) +#swift_store_admin_tenants = + +# If set to False, disables SSL layer compression of https swift +# requests. Setting to False may improve performance for images which +# are already in a compressed format, eg qcow2. (boolean value) +#swift_store_ssl_compression = true + +# The number of times a Swift download will be retried before the +# request fails. (integer value) +#swift_store_retry_get_count = 0 + +# The reference to the default swift account/backing store parameters +# to use for adding new images. (string value) +#default_swift_reference = ref1 + +# Version of the authentication service to use. Valid versions are 2 +# and 3 for keystone and 1 (deprecated) for swauth and rackspace. +# (deprecated - use "auth_version" in swift_store_config_file) (string +# value) +#swift_store_auth_version = 2 + +# The address where the Swift authentication service is listening. +# (deprecated - use "auth_address" in swift_store_config_file) (string +# value) +#swift_store_auth_address = + +# The user to authenticate against the Swift authentication service +# (deprecated - use "user" in swift_store_config_file) (string value) +#swift_store_user = + +# Auth key for the user authenticating against the Swift +# authentication service. (deprecated - use "key" in +# swift_store_config_file) (string value) +#swift_store_key = + +# The config file that has the swift account(s)configs. (string value) +#swift_store_config_file = + # Hostname or IP address of the instance to connect to, or a mongodb # URI, or a list of hostnames / mongodb URIs. If host is an IPv6 # literal it must be enclosed in '[' and ']' characters following the @@ -930,6 +1010,14 @@ # Service tenant name. (string value) #admin_tenant_name = admin +# Authentication type to load (unknown value) +# Deprecated group/name - [DEFAULT]/auth_plugin +#auth_type = + +# Config Section from which to load plugin specific options (unknown +# value) +#auth_section = + [matchmaker_redis] @@ -940,22 +1028,13 @@ # Host to locate redis. (string value) #host = 127.0.0.1 -# Use this port to connect to redis host. (integer value) +# Use this port to connect to redis host. (port value) +# Minimum value: 1 +# Maximum value: 65535 #port = 6379 # Password for Redis server (optional). (string value) -#password = - - -[matchmaker_ring] - -# -# From oslo.messaging -# - -# Matchmaker ring file (JSON). (string value) -# Deprecated group/name - [DEFAULT]/matchmaker_ringfile -#ringfile = /etc/oslo/matchmaker_ring.json +#password = [oslo_messaging_amqp] @@ -1010,81 +1089,26 @@ # Deprecated group/name - [amqp1]/allow_insecure_clients #allow_insecure_clients = false +# Space separated list of acceptable SASL mechanisms (string value) +# Deprecated group/name - [amqp1]/sasl_mechanisms +#sasl_mechanisms = -[oslo_messaging_qpid] - -# -# From oslo.messaging -# - -# Use durable queues in AMQP. (boolean value) -# Deprecated group/name - [DEFAULT]/amqp_durable_queues -# Deprecated group/name - [DEFAULT]/rabbit_durable_queues -#amqp_durable_queues = false - -# Auto-delete queues in AMQP. (boolean value) -# Deprecated group/name - [DEFAULT]/amqp_auto_delete -#amqp_auto_delete = false - -# Send a single AMQP reply to call message. The current behaviour -# since oslo-incubator is to send two AMQP replies - first one with -# the payload, a second one to ensure the other have finish to send -# the payload. We are going to remove it in the N release, but we must -# keep backward compatible at the same time. This option provides such -# compatibility - it defaults to False in Liberty and can be turned on -# for early adopters with a new installations or for testing. Please -# note, that this option will be removed in the Mitaka release. -# (boolean value) -#send_single_reply = false - -# Qpid broker hostname. (string value) -# Deprecated group/name - [DEFAULT]/qpid_hostname -#qpid_hostname = localhost - -# Qpid broker port. (integer value) -# Deprecated group/name - [DEFAULT]/qpid_port -#qpid_port = 5672 - -# Qpid HA cluster host:port pairs. (list value) -# Deprecated group/name - [DEFAULT]/qpid_hosts -#qpid_hosts = $qpid_hostname:$qpid_port - -# Username for Qpid connection. (string value) -# Deprecated group/name - [DEFAULT]/qpid_username -#qpid_username = - -# Password for Qpid connection. (string value) -# Deprecated group/name - [DEFAULT]/qpid_password -#qpid_password = - -# Space separated list of SASL mechanisms to use for auth. (string +# Path to directory that contains the SASL configuration (string # value) -# Deprecated group/name - [DEFAULT]/qpid_sasl_mechanisms -#qpid_sasl_mechanisms = +# Deprecated group/name - [amqp1]/sasl_config_dir +#sasl_config_dir = -# Seconds between connection keepalive heartbeats. (integer value) -# Deprecated group/name - [DEFAULT]/qpid_heartbeat -#qpid_heartbeat = 60 +# Name of configuration file (without .conf suffix) (string value) +# Deprecated group/name - [amqp1]/sasl_config_name +#sasl_config_name = -# Transport to use, either 'tcp' or 'ssl'. (string value) -# Deprecated group/name - [DEFAULT]/qpid_protocol -#qpid_protocol = tcp +# User name for message broker authentication (string value) +# Deprecated group/name - [amqp1]/username +#username = -# Whether to disable the Nagle algorithm. (boolean value) -# Deprecated group/name - [DEFAULT]/qpid_tcp_nodelay -#qpid_tcp_nodelay = true - -# The number of prefetched messages held by receiver. (integer value) -# Deprecated group/name - [DEFAULT]/qpid_receiver_capacity -#qpid_receiver_capacity = 1 - -# The qpid topology version to use. Version 1 is what was originally -# used by impl_qpid. Version 2 includes some backwards-incompatible -# changes that allow broker federation to work. Users should update -# to version 2 when they are able to take everything down, as it -# requires a clean break. (integer value) -# Deprecated group/name - [DEFAULT]/qpid_topology_version -#qpid_topology_version = 1 +# Password for message broker authentication (string value) +# Deprecated group/name - [amqp1]/password +#password = [oslo_messaging_rabbit] @@ -1102,17 +1126,6 @@ # Deprecated group/name - [DEFAULT]/amqp_auto_delete #amqp_auto_delete = false -# Send a single AMQP reply to call message. The current behaviour -# since oslo-incubator is to send two AMQP replies - first one with -# the payload, a second one to ensure the other have finish to send -# the payload. We are going to remove it in the N release, but we must -# keep backward compatible at the same time. This option provides such -# compatibility - it defaults to False in Liberty and can be turned on -# for early adopters with a new installations or for testing. Please -# note, that this option will be removed in the Mitaka release. -# (boolean value) -#send_single_reply = false - # SSL version to use (valid only if SSL enabled). Valid values are # TLSv1 and SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be # available on some distributions. (string value) @@ -1137,18 +1150,26 @@ # Deprecated group/name - [DEFAULT]/kombu_reconnect_delay #kombu_reconnect_delay = 1.0 -# How long to wait before considering a reconnect attempt to have -# failed. This value should not be longer than rpc_response_timeout. +# How long to wait a missing client beforce abandoning to send it its +# replies. This value should not be longer than rpc_response_timeout. # (integer value) -#kombu_reconnect_timeout = 60 +# Deprecated group/name - [DEFAULT]/kombu_reconnect_timeout +#kombu_missing_consumer_retry_timeout = 60 + +# Determines how the next RabbitMQ node is chosen in case the one we +# are currently connected to becomes unavailable. Takes effect only if +# more than one RabbitMQ node is provided in config. (string value) +# Allowed values: round-robin, shuffle +#kombu_failover_strategy = round-robin # The RabbitMQ broker address where a single node is used. (string # value) # Deprecated group/name - [DEFAULT]/rabbit_host #rabbit_host = localhost -# The RabbitMQ broker port where a single node is used. (integer -# value) +# The RabbitMQ broker port where a single node is used. (port value) +# Minimum value: 1 +# Maximum value: 65535 # Deprecated group/name - [DEFAULT]/rabbit_port #rabbit_port = 5672 @@ -1230,8 +1251,6 @@ # policy_file must exist for these directories to be searched. # Missing or empty directories are ignored. (multi valued) # Deprecated group/name - [DEFAULT]/policy_dirs -# This option is deprecated for removal. -# Its value may be silently ignored in the future. #policy_dirs = policy.d @@ -1249,3 +1268,20 @@ # Name of the paste configuration file. (string value) #config_file = + + +[profiler] + +# +# From glance.registry +# + +# If False fully disable profiling feature. (boolean value) +#enabled = false + +# If False doesn't trace SQL requests. (boolean value) +#trace_sqlalchemy = false + +# Secret key to use to sign Glance API and Glance Registry services +# tracing messages. (string value) +#hmac_keys = SECRET_KEY