Correct related section for enable_image_import

The documentation references the section DEFUALT
instead of DEFAULT. As this is most likely a
spelling error which will cause confusion, it is
better if we fix it.

This patch corrects the config option information
and includes an updated set of sample config files
generated from the current code including the fix.

Change-Id: If3c5e334aa1fa2ff5a28f52c00330d42cb9bcf9d
This commit is contained in:
Jesse Pretorius 2017-11-17 18:12:59 +00:00
parent 1531af4c99
commit e078c7e3b2
6 changed files with 497 additions and 55 deletions

View File

@ -172,7 +172,7 @@
# (integer value)
#image_location_quota = 10
#
# DEPRECATED:
# Python module path of data access API.
#
# Specifies the path to the API to use for accessing the data model.
@ -205,6 +205,14 @@
# * enable_v2_registry
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#data_api = glance.db.sqlalchemy.api
#
@ -463,7 +471,7 @@
# (boolean value)
#enable_v1_registry = true
#
# DEPRECATED:
# Deploy the v2 API Registry service.
#
# When this option is set to ``True``, the Registry service
@ -487,6 +495,14 @@
# * data_api
#
# (boolean value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#enable_v2_registry = true
#
@ -578,7 +594,7 @@
#
# This option does not change the 'staging' API endpoint by any means.
#
# NOTE: It is discouraged to use same path as [TASKS]/work_dir
# NOTE: It is discouraged to use same path as [task]/work_dir
#
# NOTE: 'file://<absolute-directory-path>' is the only option
# api_image_import flow will support for now.
@ -590,7 +606,7 @@
# * String starting with 'file://' followed by absolute FS path
#
# Related options:
# * [TASKS]/work_dir
# * [task]/work_dir
# * [DEFAULT]/enable_image_import (*deprecated*)
#
# (string value)
@ -608,7 +624,7 @@
# to Image Import Refactoring work.
#
# Related options:
# * [DEFUALT]/node_staging_uri (boolean value)
# * [DEFAULT]/node_staging_uri (boolean value)
# This option is deprecated for removal since Pike.
# Its value may be silently ignored in the future.
# Reason:
@ -1145,7 +1161,7 @@
# (list value)
#disabled_notifications =
#
# DEPRECATED:
# Address the registry server is hosted on.
#
# Possible values:
@ -1155,9 +1171,17 @@
# * None
#
# (unknown value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_host = 0.0.0.0
#
# DEPRECATED:
# Port the registry server is listening on.
#
# Possible values:
@ -1169,6 +1193,14 @@
# (port value)
# Minimum value: 0
# Maximum value: 65535
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_port = 9191
# DEPRECATED: Whether to pass through the user token when making requests to the
@ -1245,7 +1277,7 @@
# Keystone trusts support.
#auth_region = <None>
#
# DEPRECATED:
# Protocol to use for communication with the registry server.
#
# Provide a string value representing the protocol to use for
@ -1270,9 +1302,17 @@
#
# (string value)
# Allowed values: http, https
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_protocol = http
#
# DEPRECATED:
# Absolute path to the private key file.
#
# Provide a string value representing a valid absolute path to the
@ -1291,9 +1331,17 @@
# * registry_client_protocol
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_key_file = /etc/ssl/key/key-file.pem
#
# DEPRECATED:
# Absolute path to the certificate file.
#
# Provide a string value representing a valid absolute path to the
@ -1313,9 +1361,17 @@
# * registry_client_protocol
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_cert_file = /etc/ssl/certs/file.crt
#
# DEPRECATED:
# Absolute path to the Certificate Authority file.
#
# Provide a string value representing a valid absolute path to the
@ -1337,9 +1393,17 @@
# * registry_client_insecure
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_ca_file = /etc/ssl/cafile/file.ca
#
# DEPRECATED:
# Set verification of the registry server certificate.
#
# Provide a boolean value to determine whether or not to validate
@ -1361,9 +1425,17 @@
# * registry_client_ca_file
#
# (boolean value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_insecure = false
#
# DEPRECATED:
# Timeout value for registry requests.
#
# Provide an integer value representing the period of time in seconds
@ -1381,6 +1453,14 @@
#
# (integer value)
# Minimum value: 0
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_timeout = 600
#
@ -1547,6 +1627,10 @@
# log_config_append is set. (string value)
#syslog_log_facility = LOG_USER
# Use JSON formatting for logging. This option is ignored if log_config_append
# is set. (boolean value)
#use_json = false
# Log output to standard error. This option is ignored if log_config_append is
# set. (boolean value)
#use_stderr = false
@ -1757,7 +1841,16 @@
# Seconds to wait for a response from a call. (integer value)
#rpc_response_timeout = 60
# A URL representing the messaging driver to use and its full configuration.
# The network address and optional user credentials for connecting to the
# messaging backend, in URL format. The expected format is:
#
# driver://[user:pass@]host:port[,[userN:passN@]hostN:portN]/virtual_host?query
#
# Example: rabbit://rabbitmq:password@127.0.0.1:5672//
#
# For full details on the fields in the URL see the documentation of
# oslo_messaging.TransportURL at
# https://docs.openstack.org/oslo.messaging/latest/reference/transport.html
# (string value)
#transport_url = <None>
@ -1836,11 +1929,15 @@
# (boolean value)
#mysql_enable_ndb = false
# Timeout before idle SQL connections are reaped. (integer value)
# Connections which have been present in the connection pool longer than this
# number of seconds will be replaced with a new one the next time they are
# checked out from the pool. (integer value)
# Deprecated group/name - [DATABASE]/idle_timeout
# Deprecated group/name - [database]/idle_timeout
# Deprecated group/name - [DEFAULT]/sql_idle_timeout
# Deprecated group/name - [DATABASE]/sql_idle_timeout
# Deprecated group/name - [sql]/idle_timeout
#idle_timeout = 3600
#connection_recycle_time = 3600
# Minimum number of SQL connections to keep open in a pool. (integer value)
# Deprecated group/name - [DEFAULT]/sql_min_pool_size
@ -3293,6 +3390,22 @@
# you're using a versioned v2 endpoint here, then this should *not* be the same
# endpoint the service user utilizes for validating tokens, because normal end
# users may not be able to reach that endpoint. (string value)
# Deprecated group/name - [keystone_authtoken]/auth_uri
#www_authenticate_uri = <None>
# DEPRECATED: Complete "public" Identity API endpoint. This endpoint should not
# be an "admin" endpoint, as it should be accessible by all end users.
# Unauthenticated clients are redirected to this endpoint to authenticate.
# Although this endpoint should ideally be unversioned, client support in the
# wild varies. If you're using a versioned v2 endpoint here, then this should
# *not* be the same endpoint the service user utilizes for validating tokens,
# because normal end users may not be able to reach that endpoint. This option
# is deprecated in favor of www_authenticate_uri and will be removed in the S
# release. (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason: The auth_uri option is deprecated in favor of www_authenticate_uri and
# will be removed in the S release.
#auth_uri = <None>
# API version of the admin Identity API endpoint. (string value)
@ -3549,6 +3662,14 @@
# Password for decrypting ssl_key_file (if encrypted) (string value)
#ssl_key_password = <None>
# By default SSL checks that the name in the server's certificate matches the
# hostname in the transport_url. In some configurations it may be preferable to
# use the virtual hostname instead, for example if the server uses the Server
# Name Indication TLS extension (rfc6066) to provide a certificate per virtual
# host. Set ssl_verify_vhost to True if the server's SSL certificate uses the
# virtual host name instead of the DNS name. (boolean value)
#ssl_verify_vhost = false
# DEPRECATED: Accept clients using either SSL or plain TCP (boolean value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
@ -3630,6 +3751,14 @@
# otherwise use routable addressing (string value)
#addressing_mode = dynamic
# Enable virtual host support for those message buses that do not natively
# support virtual hosting (such as qpidd). When set to true the virtual host
# name will be added to all message bus addresses, effectively creating a
# private 'subnet' per virtual host. Set to False if the message bus supports
# virtual hosting using the 'hostname' field in the AMQP 1.0 Open performative
# as the name of the virtual host. (boolean value)
#pseudo_vhost = true
# address prefix used when sending to a specific server (string value)
#server_request_prefix = exclusive
@ -4197,6 +4326,23 @@
# valued)
#policy_dirs = policy.d
# Content Type to send and receive data for REST based policy check (string
# value)
# Allowed values: application/x-www-form-urlencoded, application/json
#remote_content_type = application/x-www-form-urlencoded
# server identity verification for REST based policy check (boolean value)
#remote_ssl_verify_server_crt = false
# Absolute path to ca cert file for REST based policy check (string value)
#remote_ssl_ca_crt_file = <None>
# Absolute path to client cert for REST based policy check (string value)
#remote_ssl_client_crt_file = <None>
# Absolute path client key file REST based policy check (string value)
#remote_ssl_client_key_file = <None>
[paste_deploy]

View File

@ -77,7 +77,7 @@
# (integer value)
#image_location_quota = 10
#
# DEPRECATED:
# Python module path of data access API.
#
# Specifies the path to the API to use for accessing the data model.
@ -110,6 +110,14 @@
# * enable_v2_registry
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#data_api = glance.db.sqlalchemy.api
#
@ -368,7 +376,7 @@
# (boolean value)
#enable_v1_registry = true
#
# DEPRECATED:
# Deploy the v2 API Registry service.
#
# When this option is set to ``True``, the Registry service
@ -392,6 +400,14 @@
# * data_api
#
# (boolean value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#enable_v2_registry = true
#
@ -483,7 +499,7 @@
#
# This option does not change the 'staging' API endpoint by any means.
#
# NOTE: It is discouraged to use same path as [TASKS]/work_dir
# NOTE: It is discouraged to use same path as [task]/work_dir
#
# NOTE: 'file://<absolute-directory-path>' is the only option
# api_image_import flow will support for now.
@ -495,7 +511,7 @@
# * String starting with 'file://' followed by absolute FS path
#
# Related options:
# * [TASKS]/work_dir
# * [task]/work_dir
# * [DEFAULT]/enable_image_import (*deprecated*)
#
# (string value)
@ -513,7 +529,7 @@
# to Image Import Refactoring work.
#
# Related options:
# * [DEFUALT]/node_staging_uri (boolean value)
# * [DEFAULT]/node_staging_uri (boolean value)
# This option is deprecated for removal since Pike.
# Its value may be silently ignored in the future.
# Reason:
@ -662,7 +678,7 @@
# (string value)
#image_cache_dir = <None>
#
# DEPRECATED:
# Address the registry server is hosted on.
#
# Possible values:
@ -672,9 +688,17 @@
# * None
#
# (unknown value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_host = 0.0.0.0
#
# DEPRECATED:
# Port the registry server is listening on.
#
# Possible values:
@ -686,9 +710,17 @@
# (port value)
# Minimum value: 0
# Maximum value: 65535
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_port = 9191
#
# DEPRECATED:
# Protocol to use for communication with the registry server.
#
# Provide a string value representing the protocol to use for
@ -713,9 +745,17 @@
#
# (string value)
# Allowed values: http, https
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_protocol = http
#
# DEPRECATED:
# Absolute path to the private key file.
#
# Provide a string value representing a valid absolute path to the
@ -734,9 +774,17 @@
# * registry_client_protocol
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_key_file = /etc/ssl/key/key-file.pem
#
# DEPRECATED:
# Absolute path to the certificate file.
#
# Provide a string value representing a valid absolute path to the
@ -756,9 +804,17 @@
# * registry_client_protocol
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_cert_file = /etc/ssl/certs/file.crt
#
# DEPRECATED:
# Absolute path to the Certificate Authority file.
#
# Provide a string value representing a valid absolute path to the
@ -780,9 +836,17 @@
# * registry_client_insecure
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_ca_file = /etc/ssl/cafile/file.ca
#
# DEPRECATED:
# Set verification of the registry server certificate.
#
# Provide a boolean value to determine whether or not to validate
@ -804,9 +868,17 @@
# * registry_client_ca_file
#
# (boolean value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_insecure = false
#
# DEPRECATED:
# Timeout value for registry requests.
#
# Provide an integer value representing the period of time in seconds
@ -824,6 +896,14 @@
#
# (integer value)
# Minimum value: 0
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_timeout = 600
# DEPRECATED: Whether to pass through the user token when making requests to the
@ -957,6 +1037,10 @@
# log_config_append is set. (string value)
#syslog_log_facility = LOG_USER
# Use JSON formatting for logging. This option is ignored if log_config_append
# is set. (boolean value)
#use_json = false
# Log output to standard error. This option is ignored if log_config_append is
# set. (boolean value)
#use_stderr = false
@ -2379,3 +2463,20 @@
# directories to be searched. Missing or empty directories are ignored. (multi
# valued)
#policy_dirs = policy.d
# Content Type to send and receive data for REST based policy check (string
# value)
# Allowed values: application/x-www-form-urlencoded, application/json
#remote_content_type = application/x-www-form-urlencoded
# server identity verification for REST based policy check (boolean value)
#remote_ssl_verify_server_crt = false
# Absolute path to ca cert file for REST based policy check (string value)
#remote_ssl_ca_crt_file = <None>
# Absolute path to client cert for REST based policy check (string value)
#remote_ssl_client_crt_file = <None>
# Absolute path client key file REST based policy check (string value)
#remote_ssl_client_key_file = <None>

View File

@ -57,6 +57,10 @@
# log_config_append is set. (string value)
#syslog_log_facility = LOG_USER
# Use JSON formatting for logging. This option is ignored if log_config_append
# is set. (boolean value)
#use_json = false
# Log output to standard error. This option is ignored if log_config_append is
# set. (boolean value)
#use_stderr = false
@ -143,11 +147,15 @@
# (boolean value)
#mysql_enable_ndb = false
# Timeout before idle SQL connections are reaped. (integer value)
# Connections which have been present in the connection pool longer than this
# number of seconds will be replaced with a new one the next time they are
# checked out from the pool. (integer value)
# Deprecated group/name - [DATABASE]/idle_timeout
# Deprecated group/name - [database]/idle_timeout
# Deprecated group/name - [DEFAULT]/sql_idle_timeout
# Deprecated group/name - [DATABASE]/sql_idle_timeout
# Deprecated group/name - [sql]/idle_timeout
#idle_timeout = 3600
#connection_recycle_time = 3600
# Minimum number of SQL connections to keep open in a pool. (integer value)
# Deprecated group/name - [DEFAULT]/sql_min_pool_size

View File

@ -151,7 +151,7 @@
# (integer value)
#image_location_quota = 10
#
# DEPRECATED:
# Python module path of data access API.
#
# Specifies the path to the API to use for accessing the data model.
@ -184,6 +184,14 @@
# * enable_v2_registry
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#data_api = glance.db.sqlalchemy.api
#
@ -442,7 +450,7 @@
# (boolean value)
#enable_v1_registry = true
#
# DEPRECATED:
# Deploy the v2 API Registry service.
#
# When this option is set to ``True``, the Registry service
@ -466,6 +474,14 @@
# * data_api
#
# (boolean value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#enable_v2_registry = true
#
@ -557,7 +573,7 @@
#
# This option does not change the 'staging' API endpoint by any means.
#
# NOTE: It is discouraged to use same path as [TASKS]/work_dir
# NOTE: It is discouraged to use same path as [task]/work_dir
#
# NOTE: 'file://<absolute-directory-path>' is the only option
# api_image_import flow will support for now.
@ -569,7 +585,7 @@
# * String starting with 'file://' followed by absolute FS path
#
# Related options:
# * [TASKS]/work_dir
# * [task]/work_dir
# * [DEFAULT]/enable_image_import (*deprecated*)
#
# (string value)
@ -587,7 +603,7 @@
# to Image Import Refactoring work.
#
# Related options:
# * [DEFUALT]/node_staging_uri (boolean value)
# * [DEFAULT]/node_staging_uri (boolean value)
# This option is deprecated for removal since Pike.
# Its value may be silently ignored in the future.
# Reason:
@ -894,6 +910,10 @@
# log_config_append is set. (string value)
#syslog_log_facility = LOG_USER
# Use JSON formatting for logging. This option is ignored if log_config_append
# is set. (boolean value)
#use_json = false
# Log output to standard error. This option is ignored if log_config_append is
# set. (boolean value)
#use_stderr = false
@ -1104,7 +1124,16 @@
# Seconds to wait for a response from a call. (integer value)
#rpc_response_timeout = 60
# A URL representing the messaging driver to use and its full configuration.
# The network address and optional user credentials for connecting to the
# messaging backend, in URL format. The expected format is:
#
# driver://[user:pass@]host:port[,[userN:passN@]hostN:portN]/virtual_host?query
#
# Example: rabbit://rabbitmq:password@127.0.0.1:5672//
#
# For full details on the fields in the URL see the documentation of
# oslo_messaging.TransportURL at
# https://docs.openstack.org/oslo.messaging/latest/reference/transport.html
# (string value)
#transport_url = <None>
@ -1154,11 +1183,15 @@
# (boolean value)
#mysql_enable_ndb = false
# Timeout before idle SQL connections are reaped. (integer value)
# Connections which have been present in the connection pool longer than this
# number of seconds will be replaced with a new one the next time they are
# checked out from the pool. (integer value)
# Deprecated group/name - [DATABASE]/idle_timeout
# Deprecated group/name - [database]/idle_timeout
# Deprecated group/name - [DEFAULT]/sql_idle_timeout
# Deprecated group/name - [DATABASE]/sql_idle_timeout
# Deprecated group/name - [sql]/idle_timeout
#idle_timeout = 3600
#connection_recycle_time = 3600
# Minimum number of SQL connections to keep open in a pool. (integer value)
# Deprecated group/name - [DEFAULT]/sql_min_pool_size
@ -1244,6 +1277,22 @@
# you're using a versioned v2 endpoint here, then this should *not* be the same
# endpoint the service user utilizes for validating tokens, because normal end
# users may not be able to reach that endpoint. (string value)
# Deprecated group/name - [keystone_authtoken]/auth_uri
#www_authenticate_uri = <None>
# DEPRECATED: Complete "public" Identity API endpoint. This endpoint should not
# be an "admin" endpoint, as it should be accessible by all end users.
# Unauthenticated clients are redirected to this endpoint to authenticate.
# Although this endpoint should ideally be unversioned, client support in the
# wild varies. If you're using a versioned v2 endpoint here, then this should
# *not* be the same endpoint the service user utilizes for validating tokens,
# because normal end users may not be able to reach that endpoint. This option
# is deprecated in favor of www_authenticate_uri and will be removed in the S
# release. (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason: The auth_uri option is deprecated in favor of www_authenticate_uri and
# will be removed in the S release.
#auth_uri = <None>
# API version of the admin Identity API endpoint. (string value)
@ -1484,6 +1533,14 @@
# Password for decrypting ssl_key_file (if encrypted) (string value)
#ssl_key_password = <None>
# By default SSL checks that the name in the server's certificate matches the
# hostname in the transport_url. In some configurations it may be preferable to
# use the virtual hostname instead, for example if the server uses the Server
# Name Indication TLS extension (rfc6066) to provide a certificate per virtual
# host. Set ssl_verify_vhost to True if the server's SSL certificate uses the
# virtual host name instead of the DNS name. (boolean value)
#ssl_verify_vhost = false
# DEPRECATED: Accept clients using either SSL or plain TCP (boolean value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
@ -1565,6 +1622,14 @@
# otherwise use routable addressing (string value)
#addressing_mode = dynamic
# Enable virtual host support for those message buses that do not natively
# support virtual hosting (such as qpidd). When set to true the virtual host
# name will be added to all message bus addresses, effectively creating a
# private 'subnet' per virtual host. Set to False if the message bus supports
# virtual hosting using the 'hostname' field in the AMQP 1.0 Open performative
# as the name of the virtual host. (boolean value)
#pseudo_vhost = true
# address prefix used when sending to a specific server (string value)
#server_request_prefix = exclusive
@ -2121,6 +2186,23 @@
# valued)
#policy_dirs = policy.d
# Content Type to send and receive data for REST based policy check (string
# value)
# Allowed values: application/x-www-form-urlencoded, application/json
#remote_content_type = application/x-www-form-urlencoded
# server identity verification for REST based policy check (boolean value)
#remote_ssl_verify_server_crt = false
# Absolute path to ca cert file for REST based policy check (string value)
#remote_ssl_ca_crt_file = <None>
# Absolute path to client cert for REST based policy check (string value)
#remote_ssl_client_crt_file = <None>
# Absolute path client key file REST based policy check (string value)
#remote_ssl_client_key_file = <None>
[paste_deploy]

View File

@ -77,7 +77,7 @@
# (integer value)
#image_location_quota = 10
#
# DEPRECATED:
# Python module path of data access API.
#
# Specifies the path to the API to use for accessing the data model.
@ -110,6 +110,14 @@
# * enable_v2_registry
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#data_api = glance.db.sqlalchemy.api
#
@ -368,7 +376,7 @@
# (boolean value)
#enable_v1_registry = true
#
# DEPRECATED:
# Deploy the v2 API Registry service.
#
# When this option is set to ``True``, the Registry service
@ -392,6 +400,14 @@
# * data_api
#
# (boolean value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#enable_v2_registry = true
#
@ -483,7 +499,7 @@
#
# This option does not change the 'staging' API endpoint by any means.
#
# NOTE: It is discouraged to use same path as [TASKS]/work_dir
# NOTE: It is discouraged to use same path as [task]/work_dir
#
# NOTE: 'file://<absolute-directory-path>' is the only option
# api_image_import flow will support for now.
@ -495,7 +511,7 @@
# * String starting with 'file://' followed by absolute FS path
#
# Related options:
# * [TASKS]/work_dir
# * [task]/work_dir
# * [DEFAULT]/enable_image_import (*deprecated*)
#
# (string value)
@ -513,7 +529,7 @@
# to Image Import Refactoring work.
#
# Related options:
# * [DEFUALT]/node_staging_uri (boolean value)
# * [DEFAULT]/node_staging_uri (boolean value)
# This option is deprecated for removal since Pike.
# Its value may be silently ignored in the future.
# Reason:
@ -694,7 +710,7 @@
# (boolean value)
#daemon = false
#
# DEPRECATED:
# Protocol to use for communication with the registry server.
#
# Provide a string value representing the protocol to use for
@ -719,9 +735,17 @@
#
# (string value)
# Allowed values: http, https
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_protocol = http
#
# DEPRECATED:
# Absolute path to the private key file.
#
# Provide a string value representing a valid absolute path to the
@ -740,9 +764,17 @@
# * registry_client_protocol
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_key_file = /etc/ssl/key/key-file.pem
#
# DEPRECATED:
# Absolute path to the certificate file.
#
# Provide a string value representing a valid absolute path to the
@ -762,9 +794,17 @@
# * registry_client_protocol
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_cert_file = /etc/ssl/certs/file.crt
#
# DEPRECATED:
# Absolute path to the Certificate Authority file.
#
# Provide a string value representing a valid absolute path to the
@ -786,9 +826,17 @@
# * registry_client_insecure
#
# (string value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_ca_file = /etc/ssl/cafile/file.ca
#
# DEPRECATED:
# Set verification of the registry server certificate.
#
# Provide a boolean value to determine whether or not to validate
@ -810,9 +858,17 @@
# * registry_client_ca_file
#
# (boolean value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_insecure = false
#
# DEPRECATED:
# Timeout value for registry requests.
#
# Provide an integer value representing the period of time in seconds
@ -830,6 +886,14 @@
#
# (integer value)
# Minimum value: 0
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_client_timeout = 600
# DEPRECATED: Whether to pass through the user token when making requests to the
@ -906,7 +970,7 @@
# Keystone trusts support.
#auth_region = <None>
#
# DEPRECATED:
# Address the registry server is hosted on.
#
# Possible values:
@ -916,9 +980,17 @@
# * None
#
# (unknown value)
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_host = 0.0.0.0
#
# DEPRECATED:
# Port the registry server is listening on.
#
# Possible values:
@ -930,6 +1002,14 @@
# (port value)
# Minimum value: 0
# Maximum value: 65535
# This option is deprecated for removal since Queens.
# Its value may be silently ignored in the future.
# Reason:
# Glance registry service is deprecated for removal.
#
# More information can be found from the spec:
# http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance
# /deprecate-registry.html
#registry_port = 9191
#
@ -989,6 +1069,10 @@
# log_config_append is set. (string value)
#syslog_log_facility = LOG_USER
# Use JSON formatting for logging. This option is ignored if log_config_append
# is set. (boolean value)
#use_json = false
# Log output to standard error. This option is ignored if log_config_append is
# set. (boolean value)
#use_stderr = false
@ -1075,11 +1159,15 @@
# (boolean value)
#mysql_enable_ndb = false
# Timeout before idle SQL connections are reaped. (integer value)
# Connections which have been present in the connection pool longer than this
# number of seconds will be replaced with a new one the next time they are
# checked out from the pool. (integer value)
# Deprecated group/name - [DATABASE]/idle_timeout
# Deprecated group/name - [database]/idle_timeout
# Deprecated group/name - [DEFAULT]/sql_idle_timeout
# Deprecated group/name - [DATABASE]/sql_idle_timeout
# Deprecated group/name - [sql]/idle_timeout
#idle_timeout = 3600
#connection_recycle_time = 3600
# Minimum number of SQL connections to keep open in a pool. (integer value)
# Deprecated group/name - [DEFAULT]/sql_min_pool_size
@ -2538,3 +2626,20 @@
# directories to be searched. Missing or empty directories are ignored. (multi
# valued)
#policy_dirs = policy.d
# Content Type to send and receive data for REST based policy check (string
# value)
# Allowed values: application/x-www-form-urlencoded, application/json
#remote_content_type = application/x-www-form-urlencoded
# server identity verification for REST based policy check (boolean value)
#remote_ssl_verify_server_crt = false
# Absolute path to ca cert file for REST based policy check (string value)
#remote_ssl_ca_crt_file = <None>
# Absolute path to client cert for REST based policy check (string value)
#remote_ssl_client_crt_file = <None>
# Absolute path client key file REST based policy check (string value)
#remote_ssl_client_key_file = <None>

View File

@ -725,7 +725,7 @@ Setting this option to True will enable the endpoints related
to Image Import Refactoring work.
Related options:
* [DEFUALT]/node_staging_uri""")),
* [DEFAULT]/node_staging_uri""")),
]
CONF = cfg.CONF