openstack
/
glance
Code Issues Proposed changes

Merge "Refresh Glance example configs for Ussuri milestone 2"

This commit is contained in:
Zuul 2020-02-13 14:05:26 +00:00 committed by Gerrit Code Review
parent 518b9cc5cb 1ec86b668c
commit f57d0453fa
4 changed files with 60 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

239
etc/glance-api.conf
View File

@ -606,13 +606,13 @@
#node_staging_uri = file:///tmp/staging/
#
# List of enabled Image Import Methods
# List of enabled Image Import Methods
#
# Both 'glance-direct' and 'web-download' are enabled by default.
# 'glance-direct', 'copy-image' and 'web-download' are enabled by default.
#
# Related options:
# * [DEFAULT]/node_staging_uri (list value)
#enabled_import_methods = [glance-direct,web-download]
# Related options:
# * [DEFAULT]/node_staging_uri (list value)
#enabled_import_methods = [glance-direct,web-download,copy-image]
#
# Strategy to determine the preference order of image locations.
@ -942,12 +942,12 @@
# and prospective) must implement this interface. Currently available drivers
# are ``sqlite`` and ``xattr``. These drivers primarily differ in the way they
# store the information about cached images:
# * The ``sqlite`` driver uses a sqlite database (which sits on every glance
# node locally) to track the usage of cached images.
# * The ``xattr`` driver uses the extended attributes of files to store this
# information. It also requires a filesystem that sets ``atime`` on the
# files
# when accessed.
#
# * The ``sqlite`` driver uses a sqlite database (which sits on every glance
# node locally) to track the usage of cached images.
# * The ``xattr`` driver uses the extended attributes of files to store this
# information. It also requires a filesystem that sets ``atime`` on the files
# when accessed.
#
# Possible values:
# * sqlite
@ -1075,14 +1075,16 @@
# Possible values:
# A comma-separated list of individual notification types or
# notification groups to be disabled. Currently supported groups:
# * image
# * image.member
# * task
# * metadef_namespace
# * metadef_object
# * metadef_property
# * metadef_resource_type
# * metadef_tag
#
# * image
# * image.member
# * task
# * metadef_namespace
# * metadef_object
# * metadef_property
# * metadef_resource_type
# * metadef_tag
#
# For a complete listing and description of each event refer to:
# http://docs.openstack.org/developer/glance/notifications.html
#
@ -2424,103 +2426,6 @@
#rados_connect_timeout = 0
[glance.store.sheepdog.store]
#
# 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
# (1048576 bytes) to chunk Glance images into. The default
# chunk size is 64 mebibytes.
#
# When using Sheepdog distributed storage system, the images are
# chunked into objects of this size and then stored across the
# distributed data store to use for Glance.
#
# Chunk sizes, if a power of two, help avoid fragmentation and
# enable improved performance.
#
# Possible values:
# * Positive integer value representing size in mebibytes.
#
# Related Options:
# * None
#
# (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
# which you want the Sheepdog daemon to listen on. The default
# port is 7000.
#
# The Sheepdog daemon, also called 'sheep', manages the storage
# in the distributed cluster by writing objects across the storage
# network. It identifies and acts on the messages it receives on
# the port number set using ``sheepdog_store_port`` option to store
# chunks of Glance images.
#
# Possible values:
# * A valid port number (0 to 65535)
#
# Related Options:
# * sheepdog_store_address
#
# (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
# Sheepdog daemon to. The default address set for the 'sheep'
# is 127.0.0.1.
#
# The Sheepdog daemon, also called 'sheep', manages the storage
# in the distributed cluster by writing objects across the storage
# network. It identifies and acts on the messages directed to the
# address set using ``sheepdog_store_address`` option to store
# chunks of Glance images.
#
# Possible values:
# * A valid IPv4 address
# * A valid IPv6 address
# * A valid hostname
#
# Related Options:
# * 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
[glance.store.swift.store]
#
@ -3318,7 +3223,6 @@
# * http
# * swift
# * rbd
# * sheepdog
# * cinder
# * vmware
#
@ -3358,7 +3262,6 @@
# * swift+https
# * swift+config
# * rbd
# * sheepdog
# * cinder
# * vsphere
#
@ -3376,7 +3279,6 @@
# swift+https - <No description provided>
# swift+config - <No description provided>
# rbd - <No description provided>
# sheepdog - <No description provided>
# cinder - <No description provided>
# vsphere - <No description provided>
# This option is deprecated for removal since Rocky.
@ -3939,96 +3841,6 @@
# (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
# (1048576 bytes) to chunk Glance images into. The default
# chunk size is 64 mebibytes.
#
# When using Sheepdog distributed storage system, the images are
# chunked into objects of this size and then stored across the
# distributed data store to use for Glance.
#
# Chunk sizes, if a power of two, help avoid fragmentation and
# enable improved performance.
#
# Possible values:
# * Positive integer value representing size in mebibytes.
#
# Related Options:
# * None
#
# (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
# which you want the Sheepdog daemon to listen on. The default
# port is 7000.
#
# The Sheepdog daemon, also called 'sheep', manages the storage
# in the distributed cluster by writing objects across the storage
# network. It identifies and acts on the messages it receives on
# the port number set using ``sheepdog_store_port`` option to store
# chunks of Glance images.
#
# Possible values:
# * A valid port number (0 to 65535)
#
# Related Options:
# * sheepdog_store_address
#
# (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
# Sheepdog daemon to. The default address set for the 'sheep'
# is 127.0.0.1.
#
# The Sheepdog daemon, also called 'sheep', manages the storage
# in the distributed cluster by writing objects across the storage
# network. It identifies and acts on the messages directed to the
# address set using ``sheepdog_store_address`` option to store
# chunks of Glance images.
#
# Possible values:
# * A valid IPv4 address
# * A valid IPv6 address
# * A valid hostname
#
# Related Options:
# * 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
#
# Set verification of the server certificate.
#
@ -5220,6 +5032,15 @@
# CA certificate PEM file used to verify the server certificate (string value)
#ssl_cafile =
# Client certificate PEM file used for authentication. (string value)
#ssl_client_cert_file =
# Client key PEM file used for authentication. (string value)
#ssl_client_key_file =
# Client key password file used for authentication. (string value)
#ssl_client_key_password =
[oslo_messaging_notifications]

115
etc/glance-cache.conf
View File

@ -502,13 +502,13 @@
#node_staging_uri = file:///tmp/staging/
#
# List of enabled Image Import Methods
# List of enabled Image Import Methods
#
# Both 'glance-direct' and 'web-download' are enabled by default.
# 'glance-direct', 'copy-image' and 'web-download' are enabled by default.
#
# Related options:
# * [DEFAULT]/node_staging_uri (list value)
#enabled_import_methods = [glance-direct,web-download]
# Related options:
# * [DEFAULT]/node_staging_uri (list value)
#enabled_import_methods = [glance-direct,web-download,copy-image]
#
# The relative path to sqlite file database that will be used for image cache
@ -544,12 +544,12 @@
# and prospective) must implement this interface. Currently available drivers
# are ``sqlite`` and ``xattr``. These drivers primarily differ in the way they
# store the information about cached images:
# * The ``sqlite`` driver uses a sqlite database (which sits on every glance
# node locally) to track the usage of cached images.
# * The ``xattr`` driver uses the extended attributes of files to store this
# information. It also requires a filesystem that sets ``atime`` on the
# files
# when accessed.
#
# * The ``sqlite`` driver uses a sqlite database (which sits on every glance
# node locally) to track the usage of cached images.
# * The ``xattr`` driver uses the extended attributes of files to store this
# information. It also requires a filesystem that sets ``atime`` on the files
# when accessed.
#
# Possible values:
# * sqlite
@ -1133,7 +1133,6 @@
# * http
# * swift
# * rbd
# * sheepdog
# * cinder
# * vmware
#
@ -1173,7 +1172,6 @@
# * swift+https
# * swift+config
# * rbd
# * sheepdog
# * cinder
# * vsphere
#
@ -1191,7 +1189,6 @@
# swift+https - <No description provided>
# swift+config - <No description provided>
# rbd - <No description provided>
# sheepdog - <No description provided>
# cinder - <No description provided>
# vsphere - <No description provided>
# This option is deprecated for removal since Rocky.
@ -1754,96 +1751,6 @@
# (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
# (1048576 bytes) to chunk Glance images into. The default
# chunk size is 64 mebibytes.
#
# When using Sheepdog distributed storage system, the images are
# chunked into objects of this size and then stored across the
# distributed data store to use for Glance.
#
# Chunk sizes, if a power of two, help avoid fragmentation and
# enable improved performance.
#
# Possible values:
# * Positive integer value representing size in mebibytes.
#
# Related Options:
# * None
#
# (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
# which you want the Sheepdog daemon to listen on. The default
# port is 7000.
#
# The Sheepdog daemon, also called 'sheep', manages the storage
# in the distributed cluster by writing objects across the storage
# network. It identifies and acts on the messages it receives on
# the port number set using ``sheepdog_store_port`` option to store
# chunks of Glance images.
#
# Possible values:
# * A valid port number (0 to 65535)
#
# Related Options:
# * sheepdog_store_address
#
# (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
# Sheepdog daemon to. The default address set for the 'sheep'
# is 127.0.0.1.
#
# The Sheepdog daemon, also called 'sheep', manages the storage
# in the distributed cluster by writing objects across the storage
# network. It identifies and acts on the messages directed to the
# address set using ``sheepdog_store_address`` option to store
# chunks of Glance images.
#
# Possible values:
# * A valid IPv4 address
# * A valid IPv6 address
# * A valid hostname
#
# Related Options:
# * 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
#
# Set verification of the server certificate.
#

19
etc/glance-registry.conf
View File

@ -585,13 +585,13 @@
#node_staging_uri = file:///tmp/staging/
#
# List of enabled Image Import Methods
# List of enabled Image Import Methods
#
# Both 'glance-direct' and 'web-download' are enabled by default.
# 'glance-direct', 'copy-image' and 'web-download' are enabled by default.
#
# Related options:
# * [DEFAULT]/node_staging_uri (list value)
#enabled_import_methods = [glance-direct,web-download]
# Related options:
# * [DEFAULT]/node_staging_uri (list value)
#enabled_import_methods = [glance-direct,web-download,copy-image]
#
# IP address to bind the glance servers to.
@ -1496,6 +1496,15 @@
# CA certificate PEM file used to verify the server certificate (string value)
#ssl_cafile =
# Client certificate PEM file used for authentication. (string value)
#ssl_client_cert_file =
# Client key PEM file used for authentication. (string value)
#ssl_client_key_file =
# Client key password file used for authentication. (string value)
#ssl_client_key_password =
[oslo_messaging_notifications]

103
etc/glance-scrubber.conf
View File

@ -502,13 +502,13 @@
#node_staging_uri = file:///tmp/staging/
#
# List of enabled Image Import Methods
# List of enabled Image Import Methods
#
# Both 'glance-direct' and 'web-download' are enabled by default.
# 'glance-direct', 'copy-image' and 'web-download' are enabled by default.
#
# Related options:
# * [DEFAULT]/node_staging_uri (list value)
#enabled_import_methods = [glance-direct,web-download]
# Related options:
# * [DEFAULT]/node_staging_uri (list value)
#enabled_import_methods = [glance-direct,web-download,copy-image]
#
# The amount of time, in seconds, to delay image scrubbing.
@ -926,7 +926,6 @@
# * http
# * swift
# * rbd
# * sheepdog
# * cinder
# * vmware
#
@ -966,7 +965,6 @@
# * swift+https
# * swift+config
# * rbd
# * sheepdog
# * cinder
# * vsphere
#
@ -984,7 +982,6 @@
# swift+https - <No description provided>
# swift+config - <No description provided>
# rbd - <No description provided>
# sheepdog - <No description provided>
# cinder - <No description provided>
# vsphere - <No description provided>
# This option is deprecated for removal since Rocky.
@ -1547,96 +1544,6 @@
# (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
# (1048576 bytes) to chunk Glance images into. The default
# chunk size is 64 mebibytes.
#
# When using Sheepdog distributed storage system, the images are
# chunked into objects of this size and then stored across the
# distributed data store to use for Glance.
#
# Chunk sizes, if a power of two, help avoid fragmentation and
# enable improved performance.
#
# Possible values:
# * Positive integer value representing size in mebibytes.
#
# Related Options:
# * None
#
# (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
# which you want the Sheepdog daemon to listen on. The default
# port is 7000.
#
# The Sheepdog daemon, also called 'sheep', manages the storage
# in the distributed cluster by writing objects across the storage
# network. It identifies and acts on the messages it receives on
# the port number set using ``sheepdog_store_port`` option to store
# chunks of Glance images.
#
# Possible values:
# * A valid port number (0 to 65535)
#
# Related Options:
# * sheepdog_store_address
#
# (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
# Sheepdog daemon to. The default address set for the 'sheep'
# is 127.0.0.1.
#
# The Sheepdog daemon, also called 'sheep', manages the storage
# in the distributed cluster by writing objects across the storage
# network. It identifies and acts on the messages directed to the
# address set using ``sheepdog_store_address`` option to store
# chunks of Glance images.
#
# Possible values:
# * A valid IPv4 address
# * A valid IPv6 address
# * A valid hostname
#
# Related Options:
# * 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
#
# Set verification of the server certificate.
#