From 0812f9700433685eb4c64e5d49b4e1fc2ca37522 Mon Sep 17 00:00:00 2001 From: Pranali Deore Date: Thu, 9 May 2024 06:30:59 +0000 Subject: [PATCH] Refresh Glance example configs for dalmatian m1 Change-Id: I2d1cf3567eb938f05a64bb0af5e2e78321eaaa4a --- etc/glance-api.conf | 82 ++++++++++++++-------------------------- etc/glance-cache.conf | 42 +++----------------- etc/glance-manage.conf | 13 ------- etc/glance-scrubber.conf | 55 +++------------------------ 4 files changed, 39 insertions(+), 153 deletions(-) diff --git a/etc/glance-api.conf b/etc/glance-api.conf index e72bbc0064..acea487401 100644 --- a/etc/glance-api.conf +++ b/etc/glance-api.conf @@ -62,36 +62,6 @@ # (string value) #public_endpoint = -# DEPRECATED: -# Allow users to add additional/custom properties to images. -# -# Glance defines a standard set of properties (in its schema) that -# appear on every image. These properties are also known as -# ``base properties``. In addition to these properties, Glance -# allows users to add custom properties to images. These are known -# as ``additional properties``. -# -# By default, this configuration option is set to ``True`` and users -# are allowed to add additional properties. The number of additional -# properties that can be added to an image can be controlled via -# ``image_property_quota`` configuration option. -# -# Possible values: -# * True -# * False -# -# Related options: -# * image_property_quota -# -# (boolean value) -# This option is deprecated for removal since Ussuri. -# Its value may be silently ignored in the future. -# Reason: -# This option is redundant. Control custom image property usage via the -# 'image_property_quota' configuration option. This option is scheduled -# to be removed during the Victoria development cycle. -#allow_additional_image_properties = true - # # Secure hashing algorithm used for computing the 'os_hash_value' property. # @@ -144,12 +114,6 @@ # This enforces an upper limit on the number of additional properties an image # can have. Any negative value is interpreted as unlimited. # -# NOTE: This won't have any impact if additional properties are disabled. Please -# refer to ``allow_additional_image_properties``. -# -# Related options: -# * ``allow_additional_image_properties`` -# # (integer value) #image_property_quota = 128 @@ -425,7 +389,7 @@ # (string value) #metadata_encryption_key = -# +# DEPRECATED: # Digest algorithm to use for digital signature. # # Provide a string value representing the digest algorithm to @@ -449,6 +413,10 @@ # * None # # (string value) +# This option is deprecated for removal since Dalmatian. +# Its value may be silently ignored in the future. +# Reason: +# This option has had no effect since the removal of native SSL support. #digest_algorithm = sha256 # @@ -1774,14 +1742,10 @@ #sqlite_synchronous = true # The back end to use for the database. (string value) -# Deprecated group/name - [DEFAULT]/db_backend #backend = sqlalchemy # 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. @@ -1810,33 +1774,24 @@ # Maximum number of database 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. (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. (integer value) -# Deprecated group/name - [DEFAULT]/sql_max_overflow -# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow #max_overflow = 50 # Verbosity of SQL debugging information: 0=None, 100=Everything. (integer # value) # Minimum value: 0 # Maximum value: 100 -# Deprecated group/name - [DEFAULT]/sql_connection_debug #connection_debug = 0 # 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. (integer value) -# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout #pool_timeout = # Enable the experimental use of database reconnect on connection lost. (boolean @@ -5766,11 +5721,16 @@ # modern queue type for RabbitMQ implementing a durable, replicated FIFO queue # based on the Raft consensus algorithm. It is available as of RabbitMQ 3.8.0. # If set this option will conflict with the HA queues (``rabbit_ha_queues``) aka -# mirrored queues, in other words the HA queues should be disabled, quorum -# queues durable by default so the amqp_durable_queues opion is ignored when -# this option enabled. (boolean value) +# mirrored queues, in other words the HA queues should be disabled. Quorum +# queues are also durable by default so the amqp_durable_queues option is +# ignored when this option is enabled. (boolean value) #rabbit_quorum_queue = false +# Use quorum queues for transients queues in RabbitMQ. Enabling this option will +# then make sure those queues are also using quorum kind of rabbit queues, which +# are HA by default. (boolean value) +#rabbit_transient_quorum_queue = false + # Each time a message is redelivered to a consumer, a counter is incremented. # Once the redelivery count exceeds the delivery limit the message gets dropped # or dead-lettered (if a DLX exchange has been configured) Used only when @@ -5829,6 +5789,22 @@ # notify consumerswhen queue is down (boolean value) #enable_cancel_on_failover = false +# Should we use consistant queue names or random ones (boolean value) +#use_queue_manager = false + +# Hostname used by queue manager (string value) +#hostname = pranali-new-devstack + +# Process name used by queue manager (string value) +#processname = oslo-config-generator + +# Use stream queues in RabbitMQ (x-queue-type: stream). The stream queue is a +# modern queue type for RabbitMQ implementing a durable, replicated FIFO queue +# based on the Raft consensus algorithm. It is available as of RabbitMQ 3.8.0. +# If set this option will replace all fanout queues with only one stream queue. +# (boolean value) +#rabbit_stream_fanout = false + [oslo_middleware] diff --git a/etc/glance-cache.conf b/etc/glance-cache.conf index 93f53b6f43..1ddcf5f917 100644 --- a/etc/glance-cache.conf +++ b/etc/glance-cache.conf @@ -4,36 +4,6 @@ # From glance.cache # -# DEPRECATED: -# Allow users to add additional/custom properties to images. -# -# Glance defines a standard set of properties (in its schema) that -# appear on every image. These properties are also known as -# ``base properties``. In addition to these properties, Glance -# allows users to add custom properties to images. These are known -# as ``additional properties``. -# -# By default, this configuration option is set to ``True`` and users -# are allowed to add additional properties. The number of additional -# properties that can be added to an image can be controlled via -# ``image_property_quota`` configuration option. -# -# Possible values: -# * True -# * False -# -# Related options: -# * image_property_quota -# -# (boolean value) -# This option is deprecated for removal since Ussuri. -# Its value may be silently ignored in the future. -# Reason: -# This option is redundant. Control custom image property usage via the -# 'image_property_quota' configuration option. This option is scheduled -# to be removed during the Victoria development cycle. -#allow_additional_image_properties = true - # # Secure hashing algorithm used for computing the 'os_hash_value' property. # @@ -86,12 +56,6 @@ # This enforces an upper limit on the number of additional properties an image # can have. Any negative value is interpreted as unlimited. # -# NOTE: This won't have any impact if additional properties are disabled. Please -# refer to ``allow_additional_image_properties``. -# -# Related options: -# * ``allow_additional_image_properties`` -# # (integer value) #image_property_quota = 128 @@ -367,7 +331,7 @@ # (string value) #metadata_encryption_key = -# +# DEPRECATED: # Digest algorithm to use for digital signature. # # Provide a string value representing the digest algorithm to @@ -391,6 +355,10 @@ # * None # # (string value) +# This option is deprecated for removal since Dalmatian. +# Its value may be silently ignored in the future. +# Reason: +# This option has had no effect since the removal of native SSL support. #digest_algorithm = sha256 # diff --git a/etc/glance-manage.conf b/etc/glance-manage.conf index 8f6d02066f..bf10215f75 100644 --- a/etc/glance-manage.conf +++ b/etc/glance-manage.conf @@ -161,14 +161,10 @@ #sqlite_synchronous = true # The back end to use for the database. (string value) -# Deprecated group/name - [DEFAULT]/db_backend #backend = sqlalchemy # 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. @@ -197,33 +193,24 @@ # Maximum number of database 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. (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. (integer value) -# Deprecated group/name - [DEFAULT]/sql_max_overflow -# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow #max_overflow = 50 # Verbosity of SQL debugging information: 0=None, 100=Everything. (integer # value) # Minimum value: 0 # Maximum value: 100 -# Deprecated group/name - [DEFAULT]/sql_connection_debug #connection_debug = 0 # 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. (integer value) -# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout #pool_timeout = # Enable the experimental use of database reconnect on connection lost. (boolean diff --git a/etc/glance-scrubber.conf b/etc/glance-scrubber.conf index f78cc99528..61f9a086e1 100644 --- a/etc/glance-scrubber.conf +++ b/etc/glance-scrubber.conf @@ -4,36 +4,6 @@ # From glance.scrubber # -# DEPRECATED: -# Allow users to add additional/custom properties to images. -# -# Glance defines a standard set of properties (in its schema) that -# appear on every image. These properties are also known as -# ``base properties``. In addition to these properties, Glance -# allows users to add custom properties to images. These are known -# as ``additional properties``. -# -# By default, this configuration option is set to ``True`` and users -# are allowed to add additional properties. The number of additional -# properties that can be added to an image can be controlled via -# ``image_property_quota`` configuration option. -# -# Possible values: -# * True -# * False -# -# Related options: -# * image_property_quota -# -# (boolean value) -# This option is deprecated for removal since Ussuri. -# Its value may be silently ignored in the future. -# Reason: -# This option is redundant. Control custom image property usage via the -# 'image_property_quota' configuration option. This option is scheduled -# to be removed during the Victoria development cycle. -#allow_additional_image_properties = true - # # Secure hashing algorithm used for computing the 'os_hash_value' property. # @@ -86,12 +56,6 @@ # This enforces an upper limit on the number of additional properties an image # can have. Any negative value is interpreted as unlimited. # -# NOTE: This won't have any impact if additional properties are disabled. Please -# refer to ``allow_additional_image_properties``. -# -# Related options: -# * ``allow_additional_image_properties`` -# # (integer value) #image_property_quota = 128 @@ -367,7 +331,7 @@ # (string value) #metadata_encryption_key = -# +# DEPRECATED: # Digest algorithm to use for digital signature. # # Provide a string value representing the digest algorithm to @@ -391,6 +355,10 @@ # * None # # (string value) +# This option is deprecated for removal since Dalmatian. +# Its value may be silently ignored in the future. +# Reason: +# This option has had no effect since the removal of native SSL support. #digest_algorithm = sha256 # @@ -770,14 +738,10 @@ #sqlite_synchronous = true # The back end to use for the database. (string value) -# Deprecated group/name - [DEFAULT]/db_backend #backend = sqlalchemy # 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. @@ -806,33 +770,24 @@ # Maximum number of database 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. (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. (integer value) -# Deprecated group/name - [DEFAULT]/sql_max_overflow -# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow #max_overflow = 50 # Verbosity of SQL debugging information: 0=None, 100=Everything. (integer # value) # Minimum value: 0 # Maximum value: 100 -# Deprecated group/name - [DEFAULT]/sql_connection_debug #connection_debug = 0 # 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. (integer value) -# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout #pool_timeout = # Enable the experimental use of database reconnect on connection lost. (boolean