openstack
/
glance
Code Issues Proposed changes

Images API version bump and config sync 

This change contains minor version bump to Images API to
indicate latest changes to the API.

Also has config file sync for for M3 release.

These two are combined for saving some gating time due to
busy infra at Train milestone 3 deadline.

Change-Id: I13133c32734751d43cc3afed9b68d015cebd5b6b
This commit is contained in:
Erno Kuvaja 2019-09-12 16:31:33 +01:00
parent b639ed080d
commit d9546dce75
10 changed files with 2447 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api-ref/source/versions/samples/image-versions-response.json
View File

@ -1,5 +1,15 @@
{
"versions": [
{
"id": "v2.9",
"links": [
{
"href": "http://glance.openstack.example.org/v2/",
"rel": "self"
}
],
"status": "EXPERIMENTAL"
},
{
"id": "v2.8",
"links": [

636
etc/glance-api.conf
View File

@ -132,7 +132,7 @@
# (boolean value)
#allow_additional_image_properties = true
# "
#
# Secure hashing algorithm used for computing the 'os_hash_value' property.
#
# This option configures the Glance "multihash", which consists of two
@ -579,7 +579,7 @@
# (string value)
#digest_algorithm = sha256
#
# DEPRECATED:
# The URL provides location where the temporary data will be stored
#
# This option is for Glance internal use only. Glance will save the
@ -596,13 +596,30 @@
# NOTE: The staging path must be on shared filesystem available to all
# Glance API nodes.
#
# NOTE: If you are using the Glance multistore feature, you *must*
# use a filesystem store instead of this setting. See the
# ``[os_glance_staging_store]`` section of this configuration file
# for more information.
#
# Possible values:
# * String starting with 'file://' followed by absolute FS path
#
# Related options:
# * [task]/work_dir
# * enabled_backends
# * [os_glance_staging_store]/filesystem_store_datadir
#
# (string value)
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# With the introduction of the Glance multistore feature, the way of
# configuring this option has changed. Please refer to
# [os_glance_staging_store]/filesystem_store_datadir for multistore
# configuration.
#
# This option is scheduled to be removed early in the 'U' development
# cycle.
#node_staging_uri = file:///tmp/staging/
#
@ -2112,16 +2129,6 @@
# Deprecated group/name - [sql]/idle_timeout
#connection_recycle_time = 3600
# 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
# indicates no limit. (integer value)
# Deprecated group/name - [DEFAULT]/sql_max_pool_size
@ -2461,12 +2468,19 @@
#
# Ceph configuration file path.
#
# This configuration option takes in the path to the Ceph configuration
# This configuration option specifies the path to the Ceph configuration
# file to be used. If the value for this option is not set by the user
# or is set to None, librados will locate the default configuration file
# which is located at /etc/ceph/ceph.conf. If using Cephx
# authentication, this file should include a reference to the right
# keyring in a client.<USER> section
# or is set to the empty string, librados will read the standard ceph.conf
# file by searching the default Ceph configuration file locations in
# sequential order. See the Ceph documentation for details.
#
# NOTE: If using Cephx authentication, this file should include a reference
# to the right keyring in a client.<USER> section
#
# NOTE 2: If you leave this option empty (the default), the actual Ceph
# configuration file used may change depending on what version of librados
# is being used. If it is important for you to know exactly which configuration
# file is in effect, you may specify that file here using this option.
#
# Possible Values:
# * A valid path to a configuration file
@ -2475,7 +2489,7 @@
# * rbd_store_user
#
# (string value)
#rbd_store_ceph_conf = /etc/ceph/ceph.conf
#rbd_store_ceph_conf =
#
# Timeout value for connecting to Ceph cluster.
@ -2503,7 +2517,7 @@
# From glance.multi_store
#
#
# DEPRECATED:
# Chunk size for images to be stored in Sheepdog data store.
#
# Provide an integer value representing the size in mebibyte
@ -2525,9 +2539,15 @@
#
# (integer value)
# Minimum value: 1
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# The Sheepdog project is no longer actively maintained. The
# Sheepdog driver is scheduled for removal in the 'U' development
# cycle.
#sheepdog_store_chunk_size = 64
#
# DEPRECATED:
# Port number on which the sheep daemon will listen.
#
# Provide an integer value representing a valid port number on
@ -2549,9 +2569,15 @@
# (port value)
# Minimum value: 0
# Maximum value: 65535
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# The Sheepdog project is no longer actively maintained. The
# Sheepdog driver is scheduled for removal in the 'U' development
# cycle.
#sheepdog_store_port = 7000
#
# DEPRECATED:
# Address to bind the Sheepdog daemon to.
#
# Provide a string value representing the address to bind the
@ -2573,6 +2599,12 @@
# * sheepdog_store_port
#
# (host address value)
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# The Sheepdog project is no longer actively maintained. The
# Sheepdog driver is scheduled for removal in the 'U' development
# cycle.
#sheepdog_store_address = 127.0.0.1
@ -3337,10 +3369,18 @@
#
#
# The default scheme to use for storing images.
# The store identifier for the default backend in which data will be
# stored.
#
# Provide a string value representing the default scheme to use for
# storing images. If not set, Glance API service will fail to start.
# The value must be defined as one of the keys in the dict defined
# by the ``enabled_backends`` configuration option in the DEFAULT
# configuration group.
#
# If a value is not defined for this option:
#
# * the consuming service may refuse to start
# * store_add calls that do not specify a specific backend will
# raise a ``glance_store.exceptions.UnknownScheme`` exception
#
# Related Options:
# * enabled_backends
@ -3348,55 +3388,6 @@
# (string value)
#default_backend = <None>
# DEPRECATED:
# Minimum interval in seconds to execute updating dynamic storage
# capabilities based on current backend status.
#
# Provide an integer value representing time in seconds to set the
# minimum interval before an update of dynamic storage capabilities
# for a storage backend can be attempted. Setting
# ``store_capabilities_update_min_interval`` does not mean updates
# occur periodically based on the set interval. Rather, the update
# is performed at the elapse of this interval set, if an operation
# of the store is triggered.
#
# By default, this option is set to zero and is disabled. Provide an
# integer value greater than zero to enable this option.
#
# NOTE 1: For more information on store capabilities and their updates,
# please visit: https://specs.openstack.org/openstack/glance-
# specs/specs/kilo/store-capabilities.html
#
# For more information on setting up a particular store in your
# deployment and help with the usage of this feature, please contact
# the storage driver maintainers listed here:
# https://docs.openstack.org/glance_store/latest/user/drivers.html
#
# NOTE 2: The dynamic store update capability described above is not
# implemented by any current store drivers. Thus, this option DOES
# NOT DO ANYTHING (and it never has). It is DEPRECATED and scheduled
# for removal early in the Stein development cycle.
#
# Possible values:
# * Zero
# * Positive integer
#
# Related Options:
# * None
#
# (integer value)
# Minimum value: 0
# This option is deprecated for removal since Rocky.
# Its value may be silently ignored in the future.
# Reason:
# This option configures a stub method that has not been implemented
# for any existing store drivers. Hence it is non-operational, and
# giving it a value does absolutely nothing.
#
# This option is scheduled for removal early in the Stein development
# cycle.
#store_capabilities_update_min_interval = 0
#
# From glance.store
#
@ -3429,7 +3420,7 @@
# ``enabled_backends`` which helps to configure multiple backend stores
# of different schemes.
#
# This option is scheduled for removal in the Train development
# This option is scheduled for removal in the U development
# cycle.
#stores = file,http
@ -3482,59 +3473,10 @@
# ``default_backend`` which acts similar to ``default_store`` config
# option.
#
# This option is scheduled for removal in the Train development
# This option is scheduled for removal in the U development
# cycle.
#default_store = file
# DEPRECATED:
# Minimum interval in seconds to execute updating dynamic storage
# capabilities based on current backend status.
#
# Provide an integer value representing time in seconds to set the
# minimum interval before an update of dynamic storage capabilities
# for a storage backend can be attempted. Setting
# ``store_capabilities_update_min_interval`` does not mean updates
# occur periodically based on the set interval. Rather, the update
# is performed at the elapse of this interval set, if an operation
# of the store is triggered.
#
# By default, this option is set to zero and is disabled. Provide an
# integer value greater than zero to enable this option.
#
# NOTE 1: For more information on store capabilities and their updates,
# please visit: https://specs.openstack.org/openstack/glance-
# specs/specs/kilo/store-capabilities.html
#
# For more information on setting up a particular store in your
# deployment and help with the usage of this feature, please contact
# the storage driver maintainers listed here:
# https://docs.openstack.org/glance_store/latest/user/drivers.html
#
# NOTE 2: The dynamic store update capability described above is not
# implemented by any current store drivers. Thus, this option DOES
# NOT DO ANYTHING (and it never has). It is DEPRECATED and scheduled
# for removal early in the Stein development cycle.
#
# Possible values:
# * Zero
# * Positive integer
#
# Related Options:
# * None
#
# (integer value)
# Minimum value: 0
# This option is deprecated for removal since Rocky.
# Its value may be silently ignored in the future.
# Reason:
# This option configures a stub method that has not been implemented
# for any existing store drivers. Hence it is non-operational, and
# giving it a value does absolutely nothing.
#
# This option is scheduled for removal early in the Stein development
# cycle.
#store_capabilities_update_min_interval = 0
#
# Information to match when looking for cinder in the service catalog.
#
@ -4042,12 +3984,19 @@
#
# Ceph configuration file path.
#
# This configuration option takes in the path to the Ceph configuration
# This configuration option specifies the path to the Ceph configuration
# file to be used. If the value for this option is not set by the user
# or is set to None, librados will locate the default configuration file
# which is located at /etc/ceph/ceph.conf. If using Cephx
# authentication, this file should include a reference to the right
# keyring in a client.<USER> section
# or is set to the empty string, librados will read the standard ceph.conf
# file by searching the default Ceph configuration file locations in
# sequential order. See the Ceph documentation for details.
#
# NOTE: If using Cephx authentication, this file should include a reference
# to the right keyring in a client.<USER> section
#
# NOTE 2: If you leave this option empty (the default), the actual Ceph
# configuration file used may change depending on what version of librados
# is being used. If it is important for you to know exactly which configuration
# file is in effect, you may specify that file here using this option.
#
# Possible Values:
# * A valid path to a configuration file
@ -4056,7 +4005,7 @@
# * rbd_store_user
#
# (string value)
#rbd_store_ceph_conf = /etc/ceph/ceph.conf
#rbd_store_ceph_conf =
#
# Timeout value for connecting to Ceph cluster.
@ -4077,7 +4026,7 @@
# (integer value)
#rados_connect_timeout = 0
#
# DEPRECATED:
# Chunk size for images to be stored in Sheepdog data store.
#
# Provide an integer value representing the size in mebibyte
@ -4099,9 +4048,15 @@
#
# (integer value)
# Minimum value: 1
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# The Sheepdog project is no longer actively maintained. The
# Sheepdog driver is scheduled for removal in the 'U' development
# cycle.
#sheepdog_store_chunk_size = 64
#
# DEPRECATED:
# Port number on which the sheep daemon will listen.
#
# Provide an integer value representing a valid port number on
@ -4123,9 +4078,15 @@
# (port value)
# Minimum value: 0
# Maximum value: 65535
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# The Sheepdog project is no longer actively maintained. The
# Sheepdog driver is scheduled for removal in the 'U' development
# cycle.
#sheepdog_store_port = 7000
#
# DEPRECATED:
# Address to bind the Sheepdog daemon to.
#
# Provide a string value representing the address to bind the
@ -4147,6 +4108,12 @@
# * sheepdog_store_port
#
# (host address value)
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# The Sheepdog project is no longer actively maintained. The
# Sheepdog driver is scheduled for removal in the 'U' development
# cycle.
#sheepdog_store_address = 127.0.0.1
#
@ -4898,7 +4865,7 @@
# Supported values for the 'container_format' image attribute (list value)
# Deprecated group/name - [DEFAULT]/container_formats
#container_formats = ami,ari,aki,bare,ovf,ova,docker
#container_formats = ami,ari,aki,bare,ovf,ova,docker,compressed
# Supported values for the 'disk_format' image attribute (list value)
# Deprecated group/name - [DEFAULT]/disk_formats
@ -4936,9 +4903,13 @@
# will be removed in the S release.
#auth_uri = <None>
# API version of the admin Identity API endpoint. (string value)
# API version of the Identity API endpoint. (string value)
#auth_version = <None>
# Interface to use for the Identity API endpoint. Valid values are "public",
# "internal" or "admin"(default). (string value)
#interface = admin
# Do not handle authorization requests within the middleware, but delegate the
# authorization decision to downstream WSGI components. (boolean value)
#delay_auth_decision = false
@ -4973,14 +4944,6 @@
# The region in which the identity server can be found. (string value)
#region_name = <None>
# DEPRECATED: Directory used to cache files related to PKI tokens. This option
# has been deprecated in the Ocata release and will be removed in the P release.
# (string value)
# This option is deprecated for removal since Ocata.
# Its value may be silently ignored in the future.
# Reason: PKI token format is no longer supported.
#signing_dir = <None>
# Optionally specify a list of memcached server(s) to use for caching. If left
# undefined, tokens will instead be cached in-process. (list value)
# Deprecated group/name - [keystone_authtoken]/memcache_servers
@ -5044,19 +5007,6 @@
# value)
#enforce_token_bind = permissive
# DEPRECATED: Hash algorithms to use for hashing PKI tokens. This may be a
# single algorithm or multiple. The algorithms are those supported by Python
# standard hashlib.new(). The hashes will be tried in the order given, so put
# the preferred one first for performance. The result of the first hash will be
# stored in the cache. This will typically be set to multiple values only while
# migrating from a less secure algorithm to a more secure one. Once all the old
# tokens are expired this option should be set to a single value for better
# performance. (list value)
# This option is deprecated for removal since Ocata.
# Its value may be silently ignored in the future.
# Reason: PKI token format is no longer supported.
#hash_algorithms = md5
# A choice of roles that must be present in a service token. Service tokens are
# allowed to request that an expired token can be used and so this check should
# tightly control that only actual services should be sending this token. Roles
@ -5071,6 +5021,10 @@
# (boolean value)
#service_token_roles_required = false
# The name or type of the service as it appears in the service catalog. This is
# used to validate tokens that have restricted access rules. (string value)
#service_type = <None>
# Authentication type to load (string value)
# Deprecated group/name - [keystone_authtoken]/auth_plugin
#auth_type = <None>
@ -5079,6 +5033,326 @@
#auth_section = <None>
[os_glance_staging_store]
#
# This is the configuration block for a store reserved for Glance's
# internal use.
#
# When the Glance multistore feature is in use, as indicated by the
# configuration option ``[DEFAULT]/enabled_backends`` having been
# configured, you must configure a *filesystem store* as the "staging
# area" for the interoperable image import process. Please see the
# Glance Train release notes and the "Multi Store Support" chapter of
# the Glance Administration Guide for more information.
#
# NOTE: Configuring this store replaces the use of the old
# ``[DEFAULT]/node_staging_uri`` option. Keep in mind, however, that the
# reserved store you configure in this section of the configuration file
# is *ignored* unless the Glance multistore feature is configured.
#
# Related Options:
#
# * [DEFAULT]/enabled_backends - NOTE: ``enabled_backends`` must have
# a value (that's how the multistore feature is enabled), but the
# list of backends must NOT include this reserved store
#
#
# From glance.reserved_stores
#
#
# Absolute path to the work directory to use as the staging area
# for the interoperable image import process.
#
# NOTE: When providing a value for this option, please make sure
# that enough space is provided for concurrent user image import operations.
# A rough estimation can be done by multiplying the expected number of
# concurrent image imports with an average image size (e.g 500MB). (A
# worst case scenario for concurrent uploads would be ``[DEFAULT]/workers``,
# in which every available API thread is satisfying a PUT request to the
# staging area.) The size estimation should be done based on the average
# size image in your deployment.
#
# Possible values:
#
# * String value representing the absolute path to a directory
# to be used by a filesystem store
# * This value MUST be different from the value used for the
# ``[os_glance_tasks_store]/filesystem_store_datadir`` option
#
# Related Options:
#
# * [os_glance_tasks_store]/filesystem_store_datadir
#
# (string value)
#
# This option has a sample default set, which means that
# its actual default value may vary from the one documented
# below.
#filesystem_store_datadir = /var/lib/glance/staging/
#
# List of directories and their priorities to which the filesystem
# backend store writes images.
#
# The filesystem store can be configured to store images in multiple
# directories as opposed to using a single directory specified by the
# ``filesystem_store_datadir`` configuration option. When using
# multiple directories, each directory can be given an optional
# priority to specify the preference order in which they should
# be used. Priority is an integer that is concatenated to the
# directory path with a colon where a higher value indicates higher
# priority. When two directories have the same priority, the directory
# with most free space is used. When no priority is specified, it
# defaults to zero.
#
# More information on configuring filesystem store with multiple store
# directories can be found at
# https://docs.openstack.org/glance/latest/configuration/configuring.html
#
# NOTE: This directory is used only when filesystem store is used as a
# storage backend. Either ``filesystem_store_datadir`` or
# ``filesystem_store_datadirs`` option must be specified in
# ``glance-api.conf``. If both options are specified, a
# ``BadStoreConfiguration`` will be raised and the filesystem store
# may not be available for adding new images.
#
# Possible values:
# * List of strings of the following form:
# * ``<a valid directory path>:<optional integer priority>``
#
# Related options:
# * ``filesystem_store_datadir``
# * ``filesystem_store_file_perm``
#
# (multi valued)
#filesystem_store_datadirs =
#
# Filesystem store metadata file.
#
# The path to a file which contains the metadata to be returned with
# any location associated with the filesystem 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 a
# string.
#
# Possible values:
# * A valid path to the store metadata file
#
# Related options:
# * None
#
# (string value)
#filesystem_store_metadata_file = <None>
#
# File access permissions for the image files.
#
# Set the intended file access permissions for image data. This provides
# a way to enable other services, e.g. Nova, to consume images directly
# from the filesystem store. The users running the services that are
# intended to be given access to could be made a member of the group
# that owns the files created. Assigning a value less then or equal to
# zero for this configuration option signifies that no changes be made
# to the default permissions. This value will be decoded as an octal
# digit.
#
# For more information, please refer the documentation at
# https://docs.openstack.org/glance/latest/configuration/configuring.html
#
# Possible values:
# * A valid file access permission
# * Zero
# * Any negative integer
#
# Related options:
# * None
#
# (integer value)
#filesystem_store_file_perm = 0
#
# Chunk size, in bytes.
#
# The chunk size used when reading or writing image files. Raising this value
# may improve the throughput but it may also slightly increase the memory usage
# when handling a large number of requests.
#
# Possible Values:
# * Any positive integer value
#
# Related options:
# * None
#
# (integer value)
# Minimum value: 1
#filesystem_store_chunk_size = 65536
[os_glance_tasks_store]
#
# This is the configuration block for a store reserved for Glance's
# internal use.
#
# When the Glance multistore feature is in use, as indicated by the
# configuration option ``[DEFAULT]/enabled_backends`` having been
# configured, you must configure a *filesystem store* for the use of
# the tasks engine. Please see the Glance Train release notes
# and the "Multi Store Support" chapter of the Glance Administration
# Guide for more information.
#
# NOTE: Configuring this store replaces the use of the old
# ``[tasks]/work_dir`` option. Keep in mind, however, that
# the reserved store you configure in this section of the configuration
# file is *ignored* unless the Glance multistore feature is configured.
#
# Related Options:
#
# * [DEFAULT]/enabled_backends - NOTE: ``enabled_backends`` must have
# a value (that's how the multistore feature is enabled), but the
# list of backends must NOT include this reserved store
#
#
# From glance.reserved_stores
#
#
# Absolute path to the work directory to use for asynchronous
# task operations.
#
# NOTE: When providing a value for this option, please make sure
# that enough space is provided for concurrent tasks to run
# efficiently without running out of space.
#
# A rough estimation can be done by multiplying the number of
# ``[taskflow_executor]/max_workers`` with an average image size
# (e.g 500MB). The image size estimation should be done based on
# the average size in your deployment. Note that depending on the
# tasks running you may need to multiply this number by some factor
# depending on what the task does. For example, you may want to double
# the available size if image conversion is enabled. All this being said,
# remember these are just estimations and you should do them based on
# the worst case scenario and be prepared to act in case they were wrong.
#
# Possible values:
# * String value representing the absolute path to a directory
# to be used by a filesystem store
# * This value MUST be different from the value used for the
# ``[os_glance_staging_store]/filesystem_store_datadir`` option
#
# Related Options:
# * [taskflow_executor]/max_workers
# * [os_glance_staging_store]/filesystem_store_datadir
#
# (string value)
#
# This option has a sample default set, which means that
# its actual default value may vary from the one documented
# below.
#filesystem_store_datadir = /var/lib/glance/tasks_work_dir/
#
# List of directories and their priorities to which the filesystem
# backend store writes images.
#
# The filesystem store can be configured to store images in multiple
# directories as opposed to using a single directory specified by the
# ``filesystem_store_datadir`` configuration option. When using
# multiple directories, each directory can be given an optional
# priority to specify the preference order in which they should
# be used. Priority is an integer that is concatenated to the
# directory path with a colon where a higher value indicates higher
# priority. When two directories have the same priority, the directory
# with most free space is used. When no priority is specified, it
# defaults to zero.
#
# More information on configuring filesystem store with multiple store
# directories can be found at
# https://docs.openstack.org/glance/latest/configuration/configuring.html
#
# NOTE: This directory is used only when filesystem store is used as a
# storage backend. Either ``filesystem_store_datadir`` or
# ``filesystem_store_datadirs`` option must be specified in
# ``glance-api.conf``. If both options are specified, a
# ``BadStoreConfiguration`` will be raised and the filesystem store
# may not be available for adding new images.
#
# Possible values:
# * List of strings of the following form:
# * ``<a valid directory path>:<optional integer priority>``
#
# Related options:
# * ``filesystem_store_datadir``
# * ``filesystem_store_file_perm``
#
# (multi valued)
#filesystem_store_datadirs =
#
# Filesystem store metadata file.
#
# The path to a file which contains the metadata to be returned with
# any location associated with the filesystem 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 a
# string.
#
# Possible values:
# * A valid path to the store metadata file
#
# Related options:
# * None
#
# (string value)
#filesystem_store_metadata_file = <None>
#
# File access permissions for the image files.
#
# Set the intended file access permissions for image data. This provides
# a way to enable other services, e.g. Nova, to consume images directly
# from the filesystem store. The users running the services that are
# intended to be given access to could be made a member of the group
# that owns the files created. Assigning a value less then or equal to
# zero for this configuration option signifies that no changes be made
# to the default permissions. This value will be decoded as an octal
# digit.
#
# For more information, please refer the documentation at
# https://docs.openstack.org/glance/latest/configuration/configuring.html
#
# Possible values:
# * A valid file access permission
# * Zero
# * Any negative integer
#
# Related options:
# * None
#
# (integer value)
#filesystem_store_file_perm = 0
#
# Chunk size, in bytes.
#
# The chunk size used when reading or writing image files. Raising this value
# may improve the throughput but it may also slightly increase the memory usage
# when handling a large number of requests.
#
# Possible Values:
# * Any positive integer value
#
# Related options:
# * None
#
# (integer value)
# Minimum value: 1
#filesystem_store_chunk_size = 65536
[oslo_concurrency]
#
@ -5322,6 +5596,17 @@
# Size of batch for the producer async send (integer value)
#producer_batch_size = 16384
# The compression codec for all data generated by the producer. If not set,
# compression will not be used. Note that the allowed values of this depend on
# the kafka version (string value)
# Possible values:
# none - <No description provided>
# gzip - <No description provided>
# snappy - <No description provided>
# lz4 - <No description provided>
# zstd - <No description provided>
#compression_codec = none
# Enable asynchronous consumer commits (boolean value)
#enable_auto_commit = false
@ -5404,6 +5689,13 @@
# Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_ca_certs
#ssl_ca_file =
# EXPERIMENTAL: Run the health check heartbeat threadthrough a native python
# thread. By default if thisoption isn't provided the health check heartbeat
# willinherit the execution model from the parent process. Byexample if the
# parent process have monkey patched thestdlib by using eventlet/greenlet then
# the heartbeatwill be run through a green thread. (boolean value)
#heartbeat_in_pthread = false
# How long to wait before reconnecting in response to an AMQP consumer cancel
# notification. (floating point value)
#kombu_reconnect_delay = 1.0
@ -5462,14 +5754,18 @@
#rabbit_qos_prefetch_count = 0
# Number of seconds after which the Rabbit broker is considered down if
# heartbeat's keep-alive fails (0 disable the heartbeat). EXPERIMENTAL (integer
# value)
# heartbeat's keep-alive fails (0 disables heartbeat). (integer value)
#heartbeat_timeout_threshold = 60
# How often times during the heartbeat_timeout_threshold we check the heartbeat.
# (integer value)
#heartbeat_rate = 2
# Enable/Disable the RabbitMQ mandatory flag for direct send. The direct send is
# used as reply,so the MessageUndeliverable exception is raised in case the
# client queue does not exist. (integer value)
#direct_mandatory_flag = True
[oslo_middleware]
@ -5496,7 +5792,9 @@
# scope. (boolean value)
#enforce_scope = false
# The file that defines policies. (string value)
# The relative or absolute path of a file that maps roles to permissions for a
# given service. Relative paths must be specified in relation to the
# configuration file setting this option. (string value)
#policy_file = policy.json
# Default rule. Enforced when a requested rule is not found. (string value)
@ -5779,7 +6077,7 @@
# (string value)
#task_executor = taskflow
#
# DEPRECATED:
# Absolute path to the work directory to use for asynchronous
# task operations.
#
@ -5800,14 +6098,30 @@
# are just estimations and you should do them based on the worst
# case scenario and be prepared to act in case they were wrong.
#
# NOTE: If you are using the Glance multistore feature, you *must*
# use a filesystem store instead of this setting. See the
# ``[os_glance_tasks_store]`` section of this configuration file
# for more information.
#
# Possible values:
# * String value representing the absolute path to the working
# directory
#
# Related Options:
# * None
# * enabled_backends
# * [os_glance_tasks_store]/filesystem_store_datadir
#
# (string value)
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# With the introduction of the Glance multistore feature, the way of
# configuring this option has changed. Please refer to
# [os_glance_tasks_store]/filesystem_store_datadir for multistore
# configuration.
#
# This option is scheduled to be removed early in the 'U' development
# cycle.
#
# This option has a sample default set, which means that
# its actual default value may vary from the one documented

121
etc/glance-cache.conf
View File

@ -28,7 +28,7 @@
# (boolean value)
#allow_additional_image_properties = true
# "
#
# Secure hashing algorithm used for computing the 'os_hash_value' property.
#
# This option configures the Glance "multihash", which consists of two
@ -475,7 +475,7 @@
# (string value)
#digest_algorithm = sha256
#
# DEPRECATED:
# The URL provides location where the temporary data will be stored
#
# This option is for Glance internal use only. Glance will save the
@ -492,13 +492,30 @@
# NOTE: The staging path must be on shared filesystem available to all
# Glance API nodes.
#
# NOTE: If you are using the Glance multistore feature, you *must*
# use a filesystem store instead of this setting. See the
# ``[os_glance_staging_store]`` section of this configuration file
# for more information.
#
# Possible values:
# * String starting with 'file://' followed by absolute FS path
#
# Related options:
# * [task]/work_dir
# * enabled_backends
# * [os_glance_staging_store]/filesystem_store_datadir
#
# (string value)
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# With the introduction of the Glance multistore feature, the way of
# configuring this option has changed. Please refer to
# [os_glance_staging_store]/filesystem_store_datadir for multistore
# configuration.
#
# This option is scheduled to be removed early in the 'U' development
# cycle.
#node_staging_uri = file:///tmp/staging/
#
@ -1148,7 +1165,7 @@
# ``enabled_backends`` which helps to configure multiple backend stores
# of different schemes.
#
# This option is scheduled for removal in the Train development
# This option is scheduled for removal in the U development
# cycle.
#stores = file,http
@ -1201,59 +1218,10 @@
# ``default_backend`` which acts similar to ``default_store`` config
# option.
#
# This option is scheduled for removal in the Train development
# This option is scheduled for removal in the U development
# cycle.
#default_store = file
# DEPRECATED:
# Minimum interval in seconds to execute updating dynamic storage
# capabilities based on current backend status.
#
# Provide an integer value representing time in seconds to set the
# minimum interval before an update of dynamic storage capabilities
# for a storage backend can be attempted. Setting
# ``store_capabilities_update_min_interval`` does not mean updates
# occur periodically based on the set interval. Rather, the update
# is performed at the elapse of this interval set, if an operation
# of the store is triggered.
#
# By default, this option is set to zero and is disabled. Provide an
# integer value greater than zero to enable this option.
#
# NOTE 1: For more information on store capabilities and their updates,
# please visit: https://specs.openstack.org/openstack/glance-
# specs/specs/kilo/store-capabilities.html
#
# For more information on setting up a particular store in your
# deployment and help with the usage of this feature, please contact
# the storage driver maintainers listed here:
# https://docs.openstack.org/glance_store/latest/user/drivers.html
#
# NOTE 2: The dynamic store update capability described above is not
# implemented by any current store drivers. Thus, this option DOES
# NOT DO ANYTHING (and it never has). It is DEPRECATED and scheduled
# for removal early in the Stein development cycle.
#
# Possible values:
# * Zero
# * Positive integer
#
# Related Options:
# * None
#
# (integer value)
# Minimum value: 0
# This option is deprecated for removal since Rocky.
# Its value may be silently ignored in the future.
# Reason:
# This option configures a stub method that has not been implemented
# for any existing store drivers. Hence it is non-operational, and
# giving it a value does absolutely nothing.
#
# This option is scheduled for removal early in the Stein development
# cycle.
#store_capabilities_update_min_interval = 0
#
# Information to match when looking for cinder in the service catalog.
#
@ -1761,12 +1729,19 @@
#
# Ceph configuration file path.
#
# This configuration option takes in the path to the Ceph configuration
# This configuration option specifies the path to the Ceph configuration
# file to be used. If the value for this option is not set by the user
# or is set to None, librados will locate the default configuration file
# which is located at /etc/ceph/ceph.conf. If using Cephx
# authentication, this file should include a reference to the right
# keyring in a client.<USER> section
# or is set to the empty string, librados will read the standard ceph.conf
# file by searching the default Ceph configuration file locations in
# sequential order. See the Ceph documentation for details.
#
# NOTE: If using Cephx authentication, this file should include a reference
# to the right keyring in a client.<USER> section
#
# NOTE 2: If you leave this option empty (the default), the actual Ceph
# configuration file used may change depending on what version of librados
# is being used. If it is important for you to know exactly which configuration
# file is in effect, you may specify that file here using this option.
#
# Possible Values:
# * A valid path to a configuration file
@ -1775,7 +1750,7 @@
# * rbd_store_user
#
# (string value)
#rbd_store_ceph_conf = /etc/ceph/ceph.conf
#rbd_store_ceph_conf =
#
# Timeout value for connecting to Ceph cluster.
@ -1796,7 +1771,7 @@
# (integer value)
#rados_connect_timeout = 0
#
# DEPRECATED:
# Chunk size for images to be stored in Sheepdog data store.
#
# Provide an integer value representing the size in mebibyte
@ -1818,9 +1793,15 @@
#
# (integer value)
# Minimum value: 1
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# The Sheepdog project is no longer actively maintained. The
# Sheepdog driver is scheduled for removal in the 'U' development
# cycle.
#sheepdog_store_chunk_size = 64
#
# DEPRECATED:
# Port number on which the sheep daemon will listen.
#
# Provide an integer value representing a valid port number on
@ -1842,9 +1823,15 @@
# (port value)
# Minimum value: 0
# Maximum value: 65535
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# The Sheepdog project is no longer actively maintained. The
# Sheepdog driver is scheduled for removal in the 'U' development
# cycle.
#sheepdog_store_port = 7000
#
# DEPRECATED:
# Address to bind the Sheepdog daemon to.
#
# Provide a string value representing the address to bind the
@ -1866,6 +1853,12 @@
# * sheepdog_store_port
#
# (host address value)
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# The Sheepdog project is no longer actively maintained. The
# Sheepdog driver is scheduled for removal in the 'U' development
# cycle.
#sheepdog_store_address = 127.0.0.1
#
@ -2623,7 +2616,9 @@
# scope. (boolean value)
#enforce_scope = false
# The file that defines policies. (string value)
# The relative or absolute path of a file that maps roles to permissions for a
# given service. Relative paths must be specified in relation to the
# configuration file setting this option. (string value)
#policy_file = policy.json
# Default rule. Enforced when a requested rule is not found. (string value)

10
etc/glance-manage.conf
View File

@ -192,16 +192,6 @@
# Deprecated group/name - [sql]/idle_timeout
#connection_recycle_time = 3600
# 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
# indicates no limit. (integer value)
# Deprecated group/name - [DEFAULT]/sql_max_pool_size

92
etc/glance-registry.conf
View File

@ -111,7 +111,7 @@
# (boolean value)
#allow_additional_image_properties = true
# "
#
# Secure hashing algorithm used for computing the 'os_hash_value' property.
#
# This option configures the Glance "multihash", which consists of two
@ -558,7 +558,7 @@
# (string value)
#digest_algorithm = sha256
#
# DEPRECATED:
# The URL provides location where the temporary data will be stored
#
# This option is for Glance internal use only. Glance will save the
@ -575,13 +575,30 @@
# NOTE: The staging path must be on shared filesystem available to all
# Glance API nodes.
#
# NOTE: If you are using the Glance multistore feature, you *must*
# use a filesystem store instead of this setting. See the
# ``[os_glance_staging_store]`` section of this configuration file
# for more information.
#
# Possible values:
# * String starting with 'file://' followed by absolute FS path
#
# Related options:
# * [task]/work_dir
# * enabled_backends
# * [os_glance_staging_store]/filesystem_store_datadir
#
# (string value)
# This option is deprecated for removal since Train.
# Its value may be silently ignored in the future.
# Reason:
# With the introduction of the Glance multistore feature, the way of
# configuring this option has changed. Please refer to
# [os_glance_staging_store]/filesystem_store_datadir for multistore
# configuration.
#
# This option is scheduled to be removed early in the 'U' development
# cycle.
#node_staging_uri = file:///tmp/staging/
#
@ -1077,16 +1094,6 @@
# Deprecated group/name - [sql]/idle_timeout
#connection_recycle_time = 3600
# 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
# indicates no limit. (integer value)
# Deprecated group/name - [DEFAULT]/sql_max_pool_size
@ -1188,9 +1195,13 @@
# will be removed in the S release.
#auth_uri = <None>
# API version of the admin Identity API endpoint. (string value)
# API version of the Identity API endpoint. (string value)
#auth_version = <None>
# Interface to use for the Identity API endpoint. Valid values are "public",
# "internal" or "admin"(default). (string value)
#interface = admin
# Do not handle authorization requests within the middleware, but delegate the
# authorization decision to downstream WSGI components. (boolean value)
#delay_auth_decision = false
@ -1225,14 +1236,6 @@
# The region in which the identity server can be found. (string value)
#region_name = <None>
# DEPRECATED: Directory used to cache files related to PKI tokens. This option
# has been deprecated in the Ocata release and will be removed in the P release.
# (string value)
# This option is deprecated for removal since Ocata.
# Its value may be silently ignored in the future.
# Reason: PKI token format is no longer supported.
#signing_dir = <None>
# Optionally specify a list of memcached server(s) to use for caching. If left
# undefined, tokens will instead be cached in-process. (list value)
# Deprecated group/name - [keystone_authtoken]/memcache_servers
@ -1296,19 +1299,6 @@
# value)
#enforce_token_bind = permissive
# DEPRECATED: Hash algorithms to use for hashing PKI tokens. This may be a
# single algorithm or multiple. The algorithms are those supported by Python
# standard hashlib.new(). The hashes will be tried in the order given, so put
# the preferred one first for performance. The result of the first hash will be
# stored in the cache. This will typically be set to multiple values only while
# migrating from a less secure algorithm to a more secure one. Once all the old
# tokens are expired this option should be set to a single value for better
# performance. (list value)
# This option is deprecated for removal since Ocata.
# Its value may be silently ignored in the future.
# Reason: PKI token format is no longer supported.
#hash_algorithms = md5
# A choice of roles that must be present in a service token. Service tokens are
# allowed to request that an expired token can be used and so this check should
# tightly control that only actual services should be sending this token. Roles
@ -1323,6 +1313,10 @@
# (boolean value)
#service_token_roles_required = false
# The name or type of the service as it appears in the service catalog. This is
# used to validate tokens that have restricted access rules. (string value)
#service_type = <None>
# Authentication type to load (string value)
# Deprecated group/name - [keystone_authtoken]/auth_plugin
#auth_type = <None>
@ -1558,6 +1552,17 @@
# Size of batch for the producer async send (integer value)
#producer_batch_size = 16384
# The compression codec for all data generated by the producer. If not set,
# compression will not be used. Note that the allowed values of this depend on
# the kafka version (string value)
# Possible values:
# none - <No description provided>
# gzip - <No description provided>
# snappy - <No description provided>
# lz4 - <No description provided>
# zstd - <No description provided>
#compression_codec = none
# Enable asynchronous consumer commits (boolean value)
#enable_auto_commit = false
@ -1640,6 +1645,13 @@
# Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_ca_certs
#ssl_ca_file =
# EXPERIMENTAL: Run the health check heartbeat threadthrough a native python
# thread. By default if thisoption isn't provided the health check heartbeat
# willinherit the execution model from the parent process. Byexample if the
# parent process have monkey patched thestdlib by using eventlet/greenlet then
# the heartbeatwill be run through a green thread. (boolean value)
#heartbeat_in_pthread = false
# How long to wait before reconnecting in response to an AMQP consumer cancel
# notification. (floating point value)
#kombu_reconnect_delay = 1.0
@ -1698,14 +1710,18 @@
#rabbit_qos_prefetch_count = 0
# Number of seconds after which the Rabbit broker is considered down if
# heartbeat's keep-alive fails (0 disable the heartbeat). EXPERIMENTAL (integer
# value)
# heartbeat's keep-alive fails (0 disables heartbeat). (integer value)
#heartbeat_timeout_threshold = 60
# How often times during the heartbeat_timeout_threshold we check the heartbeat.
# (integer value)
#heartbeat_rate = 2
# Enable/Disable the RabbitMQ mandatory flag for direct send. The direct send is
# used as reply,so the MessageUndeliverable exception is raised in case the
# client queue does not exist. (integer value)
#direct_mandatory_flag = True
[oslo_policy]
@ -1721,7 +1737,9 @@
# scope. (boolean value)
#enforce_scope = false
# The file that defines policies. (string value)
# The relative or absolute path of a file that maps roles to permissions for a
# given service. Relative paths must be specified in relation to the
# configuration file setting this option. (string value)
#policy_file = policy.json
# Default rule. Enforced when a requested rule is not found. (string value)

1903
etc/glance-scrubber.conf
View File

File diff suppressed because it is too large Load Diff

1
glance/api/middleware/version_negotiation.py
View File

@ -82,6 +82,7 @@ class VersionNegotiationFilter(wsgi.Middleware):
allowed_versions['v2.5'] = 2
allowed_versions['v2.6'] = 2
allowed_versions['v2.7'] = 2
allowed_versions['v2.9'] = 2
if CONF.enabled_backends:
allowed_versions['v2.8'] = 2
return allowed_versions

1
glance/api/versions.py
View File

@ -78,6 +78,7 @@ class Controller(object):
build_version_object(2.8, 'v2', 'EXPERIMENTAL')
])
version_objs.extend([
build_version_object(2.9, 'v2', 'EXPERIMENTAL'),
build_version_object(2.7, 'v2', 'CURRENT'),
build_version_object(2.6, 'v2', 'SUPPORTED'),
build_version_object(2.5, 'v2', 'SUPPORTED'),

5
glance/tests/functional/test_api.py
View File

@ -26,6 +26,11 @@ from glance.tests import functional
def _generate_v2_versions(url):
version_list = []
version_list.extend([
{
'id': 'v2.9',
'status': 'EXPERIMENTAL',
'links': [{'rel': 'self', 'href': url % '2'}],
},
{
'id': 'v2.7',
'status': 'CURRENT',

13
glance/tests/unit/test_versions.py
View File

@ -29,6 +29,12 @@ class VersionsTest(base.IsolatedUnitTest):
def _get_versions_list(self, url):
versions = [
{
'id': 'v2.9',
'status': 'EXPERIMENTAL',
'links': [{'rel': 'self',
'href': '%s/v2/' % url}],
},
{
'id': 'v2.7',
'status': 'CURRENT',
@ -181,8 +187,13 @@ class VersionNegotiationTest(base.IsolatedUnitTest):
self.middleware.process_request(request)
self.assertEqual('/v2/images', request.path_info)
def test_request_url_v2_9_unsupported(self):
def test_request_url_v2_9(self):
request = webob.Request.blank('/v2.9/images')
self.middleware.process_request(request)
self.assertEqual('/v2/images', request.path_info)
def test_request_url_v2_10_unsupported(self):
request = webob.Request.blank('/v2.10/images')
resp = self.middleware.process_request(request)
self.assertIsInstance(resp, versions.Controller)