From 978be1f57e1a698cadd29dfeaf86fb717f66249c Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Thu, 7 Jun 2018 09:50:36 -0400 Subject: [PATCH] Regenerate sample config files Regenerate the config files for Rocky-2 milestone release. Change-Id: I4d008daacd500ffcc8c0551ae085af854828b8c1 --- etc/glance-api.conf | 193 +++++++------------------- etc/glance-cache.conf | 37 +---- etc/glance-image-import.conf.sample | 12 +- etc/glance-manage.conf | 11 +- etc/glance-registry.conf | 203 +++++++++------------------- etc/glance-scrubber.conf | 61 ++++----- 6 files changed, 165 insertions(+), 352 deletions(-) diff --git a/etc/glance-api.conf b/etc/glance-api.conf index 1b450eb86a..578c20b908 100644 --- a/etc/glance-api.conf +++ b/etc/glance-api.conf @@ -529,7 +529,7 @@ # Related options: # * None # -# (unknown value) +# (host address value) #pydev_worker_debug_host = localhost # @@ -616,43 +616,18 @@ # # Related options: # * [task]/work_dir -# * [DEFAULT]/enable_image_import (*deprecated*) # # (string value) #node_staging_uri = file:///tmp/staging/ -# DEPRECATED: -# Enables the Image Import workflow introduced in Pike -# -# As '[DEFAULT]/node_staging_uri' is required for the Image -# Import, it's disabled per default in Pike, enabled per -# default in Queens and removed in Rocky. This allows Glance to -# operate with previous version configs upon upgrade. -# -# Setting this option to False will disable the endpoints related -# to Image Import Refactoring work. -# -# Related options: -# * [DEFAULT]/node_staging_uri (boolean value) -# This option is deprecated for removal since Pike. -# Its value may be silently ignored in the future. -# Reason: -# This option is deprecated for removal in Rocky. -# -# It was introduced to make sure that the API is not enabled -# before the '[DEFAULT]/node_staging_uri' is defined and is -# long term redundant. -#enable_image_import = true - # # List of enabled Image Import Methods # # Both 'glance-direct' and 'web-download' are enabled by default. # # Related options: -# * [DEFAULT]/node_staging_uri -# * [DEFAULT]/enable_image_import (list value) -#enabled_import_methods = glance-direct,web-download +# * [DEFAULT]/node_staging_uri (list value) +#enabled_import_methods = [glance-direct,web-download] # # Strategy to determine the preference order of image locations. @@ -777,7 +752,7 @@ # Related options: # * None # -# (unknown value) +# (host address value) #bind_host = 0.0.0.0 # @@ -1198,7 +1173,7 @@ # Related options: # * None # -# (unknown value) +# (host address value) # This option is deprecated for removal since Queens. # Its value may be silently ignored in the future. # Reason: @@ -1974,9 +1949,14 @@ # Deprecated group/name - [sql]/idle_timeout #connection_recycle_time = 3600 -# Minimum number of SQL connections to keep open in a pool. (integer value) +# DEPRECATED: 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 +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: The option to set the minimum pool size is not supported by +# sqlalchemy. #min_pool_size = 1 # Maximum number of SQL connections to keep open in a pool. Setting a value of 0 @@ -2035,6 +2015,10 @@ # raised. Set to -1 to specify an infinite retry count. (integer value) #db_max_retries = 20 +# Optional URL parameters to append onto the connection URL at connect time; +# specify as param1=value1¶m2=value2&... (string value) +#connection_parameters = + # # From oslo.db.concurrency # @@ -2747,7 +2731,7 @@ # Related Options: # * sheepdog_store_port # -# (unknown value) +# (host address value) #sheepdog_store_address = 127.0.0.1 # @@ -3300,7 +3284,7 @@ # * vmware_server_username # * vmware_server_password # -# (unknown value) +# (host address value) #vmware_server_host = 127.0.0.1 # @@ -3991,6 +3975,26 @@ # Size of batch for the producer async send (integer value) #producer_batch_size = 16384 +# Enable asynchronous consumer commits (boolean value) +#enable_auto_commit = false + +# The maximum number of records returned in a poll call (integer value) +#max_poll_records = 500 + +# Protocol used to communicate with brokers (string value) +# Possible values: +# PLAINTEXT - +# SASL_PLAINTEXT - +# SSL - +# SASL_SSL - +#security_protocol = PLAINTEXT + +# Mechanism when security protocol is SASL (string value) +#sasl_mechanism = PLAIN + +# CA certificate PEM file used to verify the server certificate (string value) +#ssl_cafile = + [oslo_messaging_notifications] @@ -4033,8 +4037,9 @@ # Auto-delete queues in AMQP. (boolean value) #amqp_auto_delete = false -# Enable SSL (boolean value) -#ssl = +# Connect over SSL. (boolean value) +# Deprecated group/name - [oslo_messaging_rabbit]/rabbit_use_ssl +#ssl = 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 @@ -4168,113 +4173,6 @@ # Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake (boolean value) #fake_rabbit = false -# Maximum number of channels to allow (integer value) -#channel_max = - -# The maximum byte size for an AMQP frame (integer value) -#frame_max = - -# How often to send heartbeats for consumer's connections (integer value) -#heartbeat_interval = 3 - -# Arguments passed to ssl.wrap_socket (dict value) -#ssl_options = - -# Set socket timeout in seconds for connection's socket (floating point value) -#socket_timeout = 0.25 - -# Set TCP_USER_TIMEOUT in seconds for connection's socket (floating point value) -#tcp_user_timeout = 0.25 - -# Set delay for reconnection to some host which has connection error (floating -# point value) -#host_connection_reconnect_delay = 0.25 - -# Connection factory implementation (string value) -# Possible values: -# new - -# single - -# read_write - -#connection_factory = single - -# Maximum number of connections to keep queued. (integer value) -#pool_max_size = 30 - -# Maximum number of connections to create above `pool_max_size`. (integer value) -#pool_max_overflow = 0 - -# Default number of seconds to wait for a connections to available (integer -# value) -#pool_timeout = 30 - -# Lifetime of a connection (since creation) in seconds or None for no recycling. -# Expired connections are closed on acquire. (integer value) -#pool_recycle = 600 - -# Threshold at which inactive (since release) connections are considered stale -# in seconds or None for no staleness. Stale connections are closed on acquire. -# (integer value) -#pool_stale = 60 - -# Default serialization mechanism for serializing/deserializing -# outgoing/incoming messages (string value) -# Possible values: -# json - -# msgpack - -#default_serializer_type = json - -# Persist notification messages. (boolean value) -#notification_persistence = false - -# Exchange name for sending notifications (string value) -#default_notification_exchange = ${control_exchange}_notification - -# Max number of not acknowledged message which RabbitMQ can send to notification -# listener. (integer value) -#notification_listener_prefetch_count = 100 - -# Reconnecting retry count in case of connectivity problem during sending -# notification, -1 means infinite retry. (integer value) -#default_notification_retry_attempts = -1 - -# Reconnecting retry delay in case of connectivity problem during sending -# notification message (floating point value) -#notification_retry_delay = 0.25 - -# Time to live for rpc queues without consumers in seconds. (integer value) -#rpc_queue_expiration = 60 - -# Exchange name for sending RPC messages (string value) -#default_rpc_exchange = ${control_exchange}_rpc - -# Exchange name for receiving RPC replies (string value) -#rpc_reply_exchange = ${control_exchange}_rpc_reply - -# Max number of not acknowledged message which RabbitMQ can send to rpc -# listener. (integer value) -#rpc_listener_prefetch_count = 100 - -# Max number of not acknowledged message which RabbitMQ can send to rpc reply -# listener. (integer value) -#rpc_reply_listener_prefetch_count = 100 - -# Reconnecting retry count in case of connectivity problem during sending reply. -# -1 means infinite retry during rpc_timeout (integer value) -#rpc_reply_retry_attempts = -1 - -# Reconnecting retry delay in case of connectivity problem during sending reply. -# (floating point value) -#rpc_reply_retry_delay = 0.25 - -# Reconnecting retry count in case of connectivity problem during sending RPC -# message, -1 means infinite retry. If actual retry attempts in not 0 the rpc -# request could be processed more than one time (integer value) -#default_rpc_retry_attempts = -1 - -# Reconnecting retry delay in case of connectivity problem during sending RPC -# message (floating point value) -#rpc_retry_delay = 0.25 - [oslo_messaging_zmq] @@ -4638,6 +4536,17 @@ # (string value) #sentinel_service_name = mymaster +# +# Enable filter traces that contain error/exception to a separated place. +# Default value is set to False. +# +# Possible values: +# +# * True: Enable filter traces that contain error/exception. +# * False: Disable the filter. +# (boolean value) +#filter_error_trace = false + [store_type_location_strategy] diff --git a/etc/glance-cache.conf b/etc/glance-cache.conf index beaf4fa581..07af0c002a 100644 --- a/etc/glance-cache.conf +++ b/etc/glance-cache.conf @@ -425,7 +425,7 @@ # Related options: # * None # -# (unknown value) +# (host address value) #pydev_worker_debug_host = localhost # @@ -512,43 +512,18 @@ # # Related options: # * [task]/work_dir -# * [DEFAULT]/enable_image_import (*deprecated*) # # (string value) #node_staging_uri = file:///tmp/staging/ -# DEPRECATED: -# Enables the Image Import workflow introduced in Pike -# -# As '[DEFAULT]/node_staging_uri' is required for the Image -# Import, it's disabled per default in Pike, enabled per -# default in Queens and removed in Rocky. This allows Glance to -# operate with previous version configs upon upgrade. -# -# Setting this option to False will disable the endpoints related -# to Image Import Refactoring work. -# -# Related options: -# * [DEFAULT]/node_staging_uri (boolean value) -# This option is deprecated for removal since Pike. -# Its value may be silently ignored in the future. -# Reason: -# This option is deprecated for removal in Rocky. -# -# It was introduced to make sure that the API is not enabled -# before the '[DEFAULT]/node_staging_uri' is defined and is -# long term redundant. -#enable_image_import = true - # # List of enabled Image Import Methods # # Both 'glance-direct' and 'web-download' are enabled by default. # # Related options: -# * [DEFAULT]/node_staging_uri -# * [DEFAULT]/enable_image_import (list value) -#enabled_import_methods = glance-direct,web-download +# * [DEFAULT]/node_staging_uri (list value) +#enabled_import_methods = [glance-direct,web-download] # # The relative path to sqlite file database that will be used for image cache @@ -699,7 +674,7 @@ # Related options: # * None # -# (unknown value) +# (host address value) # This option is deprecated for removal since Queens. # Its value may be silently ignored in the future. # Reason: @@ -1809,7 +1784,7 @@ # Related Options: # * sheepdog_store_port # -# (unknown value) +# (host address value) #sheepdog_store_address = 127.0.0.1 # @@ -2362,7 +2337,7 @@ # * vmware_server_username # * vmware_server_password # -# (unknown value) +# (host address value) #vmware_server_host = 127.0.0.1 # diff --git a/etc/glance-image-import.conf.sample b/etc/glance-image-import.conf.sample index f1b7f63554..cf144303e8 100644 --- a/etc/glance-image-import.conf.sample +++ b/etc/glance-image-import.conf.sample @@ -63,7 +63,7 @@ # * disallowed_ports # # (list value) -#allowed_schemes = http,https +#allowed_schemes = [http,https] # # Specify the "blacklist" of uri schemes disallowed for web-download. @@ -89,7 +89,7 @@ # * disallowed_ports # # (list value) -#disallowed_schemes = +#disallowed_schemes = [] # # Specify the "whitelist" of allowed target hosts for web-download. @@ -118,7 +118,7 @@ # * disallowed_ports # # (list value) -#allowed_hosts = +#allowed_hosts = [] # # Specify the "blacklist" of hosts disallowed for web-download. @@ -146,7 +146,7 @@ # * disallowed_ports # # (list value) -#disallowed_hosts = +#disallowed_hosts = [] # # Specify the "whitelist" of allowed ports for web-download. @@ -173,7 +173,7 @@ # * disallowed_hosts # * disallowed_ports # (list value) -#allowed_ports = 80,443 +#allowed_ports = [80,443] # # Specify the "blacklist" of disallowed ports for web-download. @@ -200,7 +200,7 @@ # * allowed_ports # # (list value) -#disallowed_ports = +#disallowed_ports = [] [inject_metadata_properties] diff --git a/etc/glance-manage.conf b/etc/glance-manage.conf index 6495eb61b8..f7c6d37463 100644 --- a/etc/glance-manage.conf +++ b/etc/glance-manage.conf @@ -157,9 +157,14 @@ # Deprecated group/name - [sql]/idle_timeout #connection_recycle_time = 3600 -# Minimum number of SQL connections to keep open in a pool. (integer value) +# DEPRECATED: 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 +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: The option to set the minimum pool size is not supported by +# sqlalchemy. #min_pool_size = 1 # Maximum number of SQL connections to keep open in a pool. Setting a value of 0 @@ -218,6 +223,10 @@ # raised. Set to -1 to specify an infinite retry count. (integer value) #db_max_retries = 20 +# Optional URL parameters to append onto the connection URL at connect time; +# specify as param1=value1¶m2=value2&... (string value) +#connection_parameters = + # # From oslo.db.concurrency # diff --git a/etc/glance-registry.conf b/etc/glance-registry.conf index 11d4320b7f..465716b84f 100644 --- a/etc/glance-registry.conf +++ b/etc/glance-registry.conf @@ -4,7 +4,7 @@ # From glance.registry # -# +# DEPRECATED: # Set the image owner to tenant or the authenticated user. # # Assign a boolean value to determine the owner of an image. When set to @@ -22,6 +22,15 @@ # * None # # (boolean value) +# This option is deprecated for removal since Rocky. +# Its value may be silently ignored in the future. +# Reason: +# The non-default setting for this option misaligns Glance with other +# OpenStack services with respect to resource ownership. Further, surveys +# indicate that this option is not used by operators. The option will be +# removed early in the 'S' development cycle following the standard OpenStack +# deprecation policy. As the option is not in wide use, no migration path is +# proposed. #owner_is_tenant = true # @@ -499,7 +508,7 @@ # Related options: # * None # -# (unknown value) +# (host address value) #pydev_worker_debug_host = localhost # @@ -586,43 +595,18 @@ # # Related options: # * [task]/work_dir -# * [DEFAULT]/enable_image_import (*deprecated*) # # (string value) #node_staging_uri = file:///tmp/staging/ -# DEPRECATED: -# Enables the Image Import workflow introduced in Pike -# -# As '[DEFAULT]/node_staging_uri' is required for the Image -# Import, it's disabled per default in Pike, enabled per -# default in Queens and removed in Rocky. This allows Glance to -# operate with previous version configs upon upgrade. -# -# Setting this option to False will disable the endpoints related -# to Image Import Refactoring work. -# -# Related options: -# * [DEFAULT]/node_staging_uri (boolean value) -# This option is deprecated for removal since Pike. -# Its value may be silently ignored in the future. -# Reason: -# This option is deprecated for removal in Rocky. -# -# It was introduced to make sure that the API is not enabled -# before the '[DEFAULT]/node_staging_uri' is defined and is -# long term redundant. -#enable_image_import = true - # # List of enabled Image Import Methods # # Both 'glance-direct' and 'web-download' are enabled by default. # # Related options: -# * [DEFAULT]/node_staging_uri -# * [DEFAULT]/enable_image_import (list value) -#enabled_import_methods = glance-direct,web-download +# * [DEFAULT]/node_staging_uri (list value) +#enabled_import_methods = [glance-direct,web-download] # # IP address to bind the glance servers to. @@ -641,7 +625,7 @@ # Related options: # * None # -# (unknown value) +# (host address value) #bind_host = 0.0.0.0 # @@ -775,7 +759,10 @@ # # Provide a non-negative integer value to set the number of child # process workers to service requests. By default, the number of CPUs -# available is set as the value for ``workers``. +# available is set as the value for ``workers`` limited to 8. For +# example if the processor count is 6, 6 workers will be used, if the +# processor count is 24 only 8 workers will be used. The limit will only +# apply to the default value, if 24 workers is configured, 24 is used. # # Each worker process is made to listen on the port set in the # configuration file and contains a greenthread pool of size 1000. @@ -1208,9 +1195,14 @@ # Deprecated group/name - [sql]/idle_timeout #connection_recycle_time = 3600 -# Minimum number of SQL connections to keep open in a pool. (integer value) +# DEPRECATED: 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 +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: The option to set the minimum pool size is not supported by +# sqlalchemy. #min_pool_size = 1 # Maximum number of SQL connections to keep open in a pool. Setting a value of 0 @@ -1269,6 +1261,10 @@ # raised. Set to -1 to specify an infinite retry count. (integer value) #db_max_retries = 20 +# Optional URL parameters to append onto the connection URL at connect time; +# specify as param1=value1¶m2=value2&... (string value) +#connection_parameters = + # # From oslo.db.concurrency # @@ -1776,6 +1772,26 @@ # Size of batch for the producer async send (integer value) #producer_batch_size = 16384 +# Enable asynchronous consumer commits (boolean value) +#enable_auto_commit = false + +# The maximum number of records returned in a poll call (integer value) +#max_poll_records = 500 + +# Protocol used to communicate with brokers (string value) +# Possible values: +# PLAINTEXT - +# SASL_PLAINTEXT - +# SSL - +# SASL_SSL - +#security_protocol = PLAINTEXT + +# Mechanism when security protocol is SASL (string value) +#sasl_mechanism = PLAIN + +# CA certificate PEM file used to verify the server certificate (string value) +#ssl_cafile = + [oslo_messaging_notifications] @@ -1818,8 +1834,9 @@ # Auto-delete queues in AMQP. (boolean value) #amqp_auto_delete = false -# Enable SSL (boolean value) -#ssl = +# Connect over SSL. (boolean value) +# Deprecated group/name - [oslo_messaging_rabbit]/rabbit_use_ssl +#ssl = 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 @@ -1953,113 +1970,6 @@ # Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake (boolean value) #fake_rabbit = false -# Maximum number of channels to allow (integer value) -#channel_max = - -# The maximum byte size for an AMQP frame (integer value) -#frame_max = - -# How often to send heartbeats for consumer's connections (integer value) -#heartbeat_interval = 3 - -# Arguments passed to ssl.wrap_socket (dict value) -#ssl_options = - -# Set socket timeout in seconds for connection's socket (floating point value) -#socket_timeout = 0.25 - -# Set TCP_USER_TIMEOUT in seconds for connection's socket (floating point value) -#tcp_user_timeout = 0.25 - -# Set delay for reconnection to some host which has connection error (floating -# point value) -#host_connection_reconnect_delay = 0.25 - -# Connection factory implementation (string value) -# Possible values: -# new - -# single - -# read_write - -#connection_factory = single - -# Maximum number of connections to keep queued. (integer value) -#pool_max_size = 30 - -# Maximum number of connections to create above `pool_max_size`. (integer value) -#pool_max_overflow = 0 - -# Default number of seconds to wait for a connections to available (integer -# value) -#pool_timeout = 30 - -# Lifetime of a connection (since creation) in seconds or None for no recycling. -# Expired connections are closed on acquire. (integer value) -#pool_recycle = 600 - -# Threshold at which inactive (since release) connections are considered stale -# in seconds or None for no staleness. Stale connections are closed on acquire. -# (integer value) -#pool_stale = 60 - -# Default serialization mechanism for serializing/deserializing -# outgoing/incoming messages (string value) -# Possible values: -# json - -# msgpack - -#default_serializer_type = json - -# Persist notification messages. (boolean value) -#notification_persistence = false - -# Exchange name for sending notifications (string value) -#default_notification_exchange = ${control_exchange}_notification - -# Max number of not acknowledged message which RabbitMQ can send to notification -# listener. (integer value) -#notification_listener_prefetch_count = 100 - -# Reconnecting retry count in case of connectivity problem during sending -# notification, -1 means infinite retry. (integer value) -#default_notification_retry_attempts = -1 - -# Reconnecting retry delay in case of connectivity problem during sending -# notification message (floating point value) -#notification_retry_delay = 0.25 - -# Time to live for rpc queues without consumers in seconds. (integer value) -#rpc_queue_expiration = 60 - -# Exchange name for sending RPC messages (string value) -#default_rpc_exchange = ${control_exchange}_rpc - -# Exchange name for receiving RPC replies (string value) -#rpc_reply_exchange = ${control_exchange}_rpc_reply - -# Max number of not acknowledged message which RabbitMQ can send to rpc -# listener. (integer value) -#rpc_listener_prefetch_count = 100 - -# Max number of not acknowledged message which RabbitMQ can send to rpc reply -# listener. (integer value) -#rpc_reply_listener_prefetch_count = 100 - -# Reconnecting retry count in case of connectivity problem during sending reply. -# -1 means infinite retry during rpc_timeout (integer value) -#rpc_reply_retry_attempts = -1 - -# Reconnecting retry delay in case of connectivity problem during sending reply. -# (floating point value) -#rpc_reply_retry_delay = 0.25 - -# Reconnecting retry count in case of connectivity problem during sending RPC -# message, -1 means infinite retry. If actual retry attempts in not 0 the rpc -# request could be processed more than one time (integer value) -#default_rpc_retry_attempts = -1 - -# Reconnecting retry delay in case of connectivity problem during sending RPC -# message (floating point value) -#rpc_retry_delay = 0.25 - [oslo_messaging_zmq] @@ -2411,3 +2321,14 @@ # sentinal_service_name=mymaster). # (string value) #sentinel_service_name = mymaster + +# +# Enable filter traces that contain error/exception to a separated place. +# Default value is set to False. +# +# Possible values: +# +# * True: Enable filter traces that contain error/exception. +# * False: Disable the filter. +# (boolean value) +#filter_error_trace = false diff --git a/etc/glance-scrubber.conf b/etc/glance-scrubber.conf index d77b393a49..423bd92d23 100644 --- a/etc/glance-scrubber.conf +++ b/etc/glance-scrubber.conf @@ -425,7 +425,7 @@ # Related options: # * None # -# (unknown value) +# (host address value) #pydev_worker_debug_host = localhost # @@ -512,43 +512,18 @@ # # Related options: # * [task]/work_dir -# * [DEFAULT]/enable_image_import (*deprecated*) # # (string value) #node_staging_uri = file:///tmp/staging/ -# DEPRECATED: -# Enables the Image Import workflow introduced in Pike -# -# As '[DEFAULT]/node_staging_uri' is required for the Image -# Import, it's disabled per default in Pike, enabled per -# default in Queens and removed in Rocky. This allows Glance to -# operate with previous version configs upon upgrade. -# -# Setting this option to False will disable the endpoints related -# to Image Import Refactoring work. -# -# Related options: -# * [DEFAULT]/node_staging_uri (boolean value) -# This option is deprecated for removal since Pike. -# Its value may be silently ignored in the future. -# Reason: -# This option is deprecated for removal in Rocky. -# -# It was introduced to make sure that the API is not enabled -# before the '[DEFAULT]/node_staging_uri' is defined and is -# long term redundant. -#enable_image_import = true - # # List of enabled Image Import Methods # # Both 'glance-direct' and 'web-download' are enabled by default. # # Related options: -# * [DEFAULT]/node_staging_uri -# * [DEFAULT]/enable_image_import (list value) -#enabled_import_methods = glance-direct,web-download +# * [DEFAULT]/node_staging_uri (list value) +#enabled_import_methods = [glance-direct,web-download] # # The amount of time, in seconds, to delay image scrubbing. @@ -670,6 +645,21 @@ # (boolean value) #daemon = false +# +# Restore the image status from 'pending_delete' to 'active'. +# +# This option is used by administrator to reset the image's status from +# 'pending_delete' to 'active' when the image is deleted by mistake and +# 'pending delete' feature is enabled in Glance. Please make sure the +# glance-scrubber daemon is stopped before restoring the image to avoid image +# data inconsistency. +# +# Possible values: +# * image's uuid +# +# (string value) +#restore = + # # From oslo.log # @@ -827,9 +817,14 @@ # Deprecated group/name - [sql]/idle_timeout #connection_recycle_time = 3600 -# Minimum number of SQL connections to keep open in a pool. (integer value) +# DEPRECATED: 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 +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: The option to set the minimum pool size is not supported by +# sqlalchemy. #min_pool_size = 1 # Maximum number of SQL connections to keep open in a pool. Setting a value of 0 @@ -888,6 +883,10 @@ # raised. Set to -1 to specify an infinite retry count. (integer value) #db_max_retries = 20 +# Optional URL parameters to append onto the connection URL at connect time; +# specify as param1=value1¶m2=value2&... (string value) +#connection_parameters = + # # From oslo.db.concurrency # @@ -1600,7 +1599,7 @@ # Related Options: # * sheepdog_store_port # -# (unknown value) +# (host address value) #sheepdog_store_address = 127.0.0.1 # @@ -2153,7 +2152,7 @@ # * vmware_server_username # * vmware_server_password # -# (unknown value) +# (host address value) #vmware_server_host = 127.0.0.1 #