Merge "Sync example configs for Yoga"

etc/glance-api.conf

@@ -7,7 +7,7 @@
 #
 # Allow limited access to unauthenticated users.
 #
-# Assign a boolean to determine API access for unathenticated
+# Assign a boolean to determine API access for unauthenticated
 # users. When set to False, the API cannot be accessed by
 # unauthenticated users. When set to True, unauthenticated users can
 # access the API with read-only privileges. This however only applies
@@ -1691,7 +1691,7 @@
 #cinder_enforce_multipath = false
 
 #
-# Flag to identify mutipath is supported or not in the deployment.
+# Flag to identify multipath is supported or not in the deployment.
 #
 # Set it to False if multipath is not supported.
 #
@@ -1844,9 +1844,13 @@
 # From oslo.db.concurrency
 #
 
-# Enable the experimental use of thread pooling for all DB API calls (boolean
+# DEPRECATED: Enable the experimental use of thread pooling for all DB API calls
-# value)
+# (boolean value)
 # Deprecated group/name - [DEFAULT]/dbapi_use_tpool
+# This option is deprecated for removal since 10.0.0.
+# Its value may be silently ignored in the future.
+# Reason: This feature has never graduated from experimental status and is now
+# being removed due to lack of maintenance and test coverage
 #use_tpool = false
 
 
@@ -1990,7 +1994,7 @@
 # sequences on the filesystem, the holes who can appear will automatically
 # be interpreted by the filesystem as null bytes, and do not really consume
 # your storage.
-# Enabling this feature will also speed up image upload and save network trafic
+# Enabling this feature will also speed up image upload and save network traffic
 # in addition to save space in the backend, as null bytes sequences are not
 # sent over the network.
 #
@@ -2191,7 +2195,7 @@
 # This configuration option enable the feature of not really write null byte
 # sequences on the RBD backend, the holes who can appear will automatically
 # be interpreted by Ceph as null bytes, and do not really consume your storage.
-# Enabling this feature will also speed up image upload and save network trafic
+# Enabling this feature will also speed up image upload and save network traffic
 # in addition to save space in the backend, as null bytes sequences are not
 # sent over the network.
 #
@@ -3572,7 +3576,7 @@
 #cinder_enforce_multipath = false
 
 #
-# Flag to identify mutipath is supported or not in the deployment.
+# Flag to identify multipath is supported or not in the deployment.
 #
 # Set it to False if multipath is not supported.
 #
@@ -3728,7 +3732,7 @@
 # sequences on the filesystem, the holes who can appear will automatically
 # be interpreted by the filesystem as null bytes, and do not really consume
 # your storage.
-# Enabling this feature will also speed up image upload and save network trafic
+# Enabling this feature will also speed up image upload and save network traffic
 # in addition to save space in the backend, as null bytes sequences are not
 # sent over the network.
 #
@@ -3915,7 +3919,7 @@
 # This configuration option enable the feature of not really write null byte
 # sequences on the RBD backend, the holes who can appear will automatically
 # be interpreted by Ceph as null bytes, and do not really consume your storage.
-# Enabling this feature will also speed up image upload and save network trafic
+# Enabling this feature will also speed up image upload and save network traffic
 # in addition to save space in the backend, as null bytes sequences are not
 # sent over the network.
 #
@@ -4834,6 +4838,37 @@
 #vmware_datastores =
 
 
+[healthcheck]
+
+#
+# From oslo.middleware.healthcheck
+#
+
+# DEPRECATED: The path to respond to healtcheck requests on. (string value)
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+#path = /healthcheck
+
+# Show more detailed information as part of the response. Security note:
+# Enabling this option may expose sensitive details about the service being
+# monitored. Be sure to verify that it will not violate your security policies.
+# (boolean value)
+#detailed = false
+
+# Additional backends that can perform health checks and report that information
+# back as part of a request. (list value)
+#backends =
+
+# Check the presence of a file to determine if an application is running on a
+# port. Used by DisableByFileHealthcheck plugin. (string value)
+#disable_by_file_path = <None>
+
+# Check the presence of a file based on a port to determine if an application is
+# running on a port. Expects a "port:path" list of strings. Used by
+# DisableByFilesPortsHealthcheck plugin. (list value)
+#disable_by_file_paths =
+
+
 [image_format]
 
 #
@@ -5404,7 +5439,8 @@
 # From oslo.messaging
 #
 
-# Use durable queues in AMQP. (boolean value)
+# Use durable queues in AMQP. If rabbit_quorum_queue is enabled, queues will be
+# durable and this value will be ignored. (boolean value)
 #amqp_durable_queues = false
 
 # Auto-delete queues in AMQP. (boolean value)
@@ -5432,14 +5468,11 @@
 # Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_ca_certs
 #ssl_ca_file =
 
-# DEPRECATED: Run the health check heartbeat thread through a native python
+# Run the health check heartbeat thread through a native python thread by
-# thread by default. If this option is equal to False then the health check
+# default. If this option is equal to False then the health check heartbeat will
-# heartbeat will inherit the execution model from the parent process. For
+# inherit the execution model from the parent process. For example if the parent
-# example if the parent process has monkey patched the stdlib by using
+# process has monkey patched the stdlib by using eventlet/greenlet then the
-# eventlet/greenlet then the heartbeat will be run through a green thread.
+# heartbeat will be run through a green thread. (boolean value)
-# (boolean value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
 #heartbeat_in_pthread = true
 
 # How long to wait before reconnecting in response to an AMQP consumer cancel
@@ -5489,6 +5522,15 @@
 # '^(?!amq\.).*' '{"ha-mode": "all"}' " (boolean value)
 #rabbit_ha_queues = false
 
+# Use quorum queues in RabbitMQ (x-queue-type: quorum). The quorum queue is a
+# modern queue type for RabbitMQ implementing a durable, replicated FIFO queue
+# based on the Raft consensus algorithm. It is available as of RabbitMQ 3.8.0.
+# If set this option will conflict with the HA queues (``rabbit_ha_queues``) aka
+# mirrored queues, in other words the HA queues should be disabled, quorum
+# queues durable by default so the amqp_durable_queues opion is ignored when
+# this option enabled. (boolean value)
+#rabbit_quorum_queue = false
+
 # Positive integer representing duration in seconds for queue TTL (x-expires).
 # Queues which are unused for the duration of the TTL are automatically deleted.
 # The parameter affects only reply and fanout queues. (integer value)
@@ -5553,7 +5595,10 @@
 # be evaluated. This means if any existing token is allowed for old defaults but
 # is disallowed for new defaults, it will be disallowed. It is encouraged to
 # enable this flag along with the ``enforce_scope`` flag so that you can get the
-# benefits of new defaults and ``scope_type`` together (boolean value)
+# benefits of new defaults and ``scope_type`` together. If ``False``, the
+# deprecated policy check string is logically OR'd with the new policy check
+# string, allowing for a graceful upgrade experience between releases with new
+# policies, which is the default behavior. (boolean value)
 #enforce_new_defaults = false
 
 # The relative or absolute path of a file that maps roles to permissions for a
@@ -5591,6 +5636,26 @@
 #remote_ssl_client_key_file = <None>
 
 
+[oslo_reports]
+
+#
+# From oslo.reports
+#
+
+# Path to a log directory where to create a file (string value)
+#log_dir = <None>
+
+# The path to a file to watch for changes to trigger the reports, instead of
+# signals. Setting this option disables the signal trigger for the reports. If
+# application is running as a WSGI application it is recommended to use this
+# instead of signals. (string value)
+#file_event_handler = <None>
+
+# How many seconds to wait between polls when file_event_handler is set (integer
+# value)
+#file_event_handler_interval = 1
+
+
 [paste_deploy]
 
 #
@@ -5601,7 +5666,7 @@
 # Deployment flavor to use in the server application pipeline.
 #
 # Provide a string value representing the appropriate deployment
-# flavor used in the server application pipleline. This is typically
+# flavor used in the server application pipeline. This is typically
 # the partial name of a pipeline in the paste configuration file with
 # the service name removed.
 #
@@ -5626,7 +5691,7 @@
 # Name of the paste configuration file.
 #
 # Provide a string value representing the name of the paste
-# configuration file to use for configuring piplelines for
+# configuration file to use for configuring pipelines for
 # server application deployments.
 #
 # NOTES:
@@ -5998,6 +6063,10 @@
 # SSL Enabled/Disabled (boolean value)
 #use_ssl = false
 
+# Vault Namespace to use for all requests to Vault. Vault Namespaces feature is
+# available only in Vault Enterprise (string value)
+#namespace = <None>
+
 
 [wsgi]
 
@@ -6018,8 +6087,8 @@
 
 #
 # Path to the python interpreter to use when spawning external
-# processes. By default this is sys.executable, which should be the
+# processes. If left unspecified, this will be sys.executable, which should
-# same interpreter running Glance itself. However, in some situations
+# be the same interpreter running Glance itself. However, in some situations
-# (i.e. uwsgi) this may not actually point to a python interpreter
+# (for example, uwsgi) sys.executable may not actually point to a python
-# itself. (string value)
+# interpreter and an alternative value must be set. (string value)
-#python_interpreter = /home/ubuntu/glance/.tox/genconfig/bin/python
+#python_interpreter = <None>

etc/glance-cache.conf

@@ -1180,7 +1180,7 @@
 #cinder_enforce_multipath = false
 
 #
-# Flag to identify mutipath is supported or not in the deployment.
+# Flag to identify multipath is supported or not in the deployment.
 #
 # Set it to False if multipath is not supported.
 #
@@ -1336,7 +1336,7 @@
 # sequences on the filesystem, the holes who can appear will automatically
 # be interpreted by the filesystem as null bytes, and do not really consume
 # your storage.
-# Enabling this feature will also speed up image upload and save network trafic
+# Enabling this feature will also speed up image upload and save network traffic
 # in addition to save space in the backend, as null bytes sequences are not
 # sent over the network.
 #
@@ -1523,7 +1523,7 @@
 # This configuration option enable the feature of not really write null byte
 # sequences on the RBD backend, the holes who can appear will automatically
 # be interpreted by Ceph as null bytes, and do not really consume your storage.
-# Enabling this feature will also speed up image upload and save network trafic
+# Enabling this feature will also speed up image upload and save network traffic
 # in addition to save space in the backend, as null bytes sequences are not
 # sent over the network.
 #
@@ -2461,7 +2461,10 @@
 # be evaluated. This means if any existing token is allowed for old defaults but
 # is disallowed for new defaults, it will be disallowed. It is encouraged to
 # enable this flag along with the ``enforce_scope`` flag so that you can get the
-# benefits of new defaults and ``scope_type`` together (boolean value)
+# benefits of new defaults and ``scope_type`` together. If ``False``, the
+# deprecated policy check string is logically OR'd with the new policy check
+# string, allowing for a graceful upgrade experience between releases with new
+# policies, which is the default behavior. (boolean value)
 #enforce_new_defaults = false
 
 # The relative or absolute path of a file that maps roles to permissions for a

etc/glance-manage.conf

@@ -249,7 +249,11 @@
 # From oslo.db.concurrency
 #
 
-# Enable the experimental use of thread pooling for all DB API calls (boolean
+# DEPRECATED: Enable the experimental use of thread pooling for all DB API calls
-# value)
+# (boolean value)
 # Deprecated group/name - [DEFAULT]/dbapi_use_tpool
+# This option is deprecated for removal since 10.0.0.
+# Its value may be silently ignored in the future.
+# Reason: This feature has never graduated from experimental status and is now
+# being removed due to lack of maintenance and test coverage
 #use_tpool = false

etc/glance-scrubber.conf

@@ -859,9 +859,13 @@
 # From oslo.db.concurrency
 #
 
-# Enable the experimental use of thread pooling for all DB API calls (boolean
+# DEPRECATED: Enable the experimental use of thread pooling for all DB API calls
-# value)
+# (boolean value)
 # Deprecated group/name - [DEFAULT]/dbapi_use_tpool
+# This option is deprecated for removal since 10.0.0.
+# Its value may be silently ignored in the future.
+# Reason: This feature has never graduated from experimental status and is now
+# being removed due to lack of maintenance and test coverage
 #use_tpool = false
 
 
@@ -1282,7 +1286,7 @@
 #cinder_enforce_multipath = false
 
 #
-# Flag to identify mutipath is supported or not in the deployment.
+# Flag to identify multipath is supported or not in the deployment.
 #
 # Set it to False if multipath is not supported.
 #
@@ -1438,7 +1442,7 @@
 # sequences on the filesystem, the holes who can appear will automatically
 # be interpreted by the filesystem as null bytes, and do not really consume
 # your storage.
-# Enabling this feature will also speed up image upload and save network trafic
+# Enabling this feature will also speed up image upload and save network traffic
 # in addition to save space in the backend, as null bytes sequences are not
 # sent over the network.
 #
@@ -1625,7 +1629,7 @@
 # This configuration option enable the feature of not really write null byte
 # sequences on the RBD backend, the holes who can appear will automatically
 # be interpreted by Ceph as null bytes, and do not really consume your storage.
-# Enabling this feature will also speed up image upload and save network trafic
+# Enabling this feature will also speed up image upload and save network traffic
 # in addition to save space in the backend, as null bytes sequences are not
 # sent over the network.
 #
@@ -2579,7 +2583,10 @@
 # be evaluated. This means if any existing token is allowed for old defaults but
 # is disallowed for new defaults, it will be disallowed. It is encouraged to
 # enable this flag along with the ``enforce_scope`` flag so that you can get the
-# benefits of new defaults and ``scope_type`` together (boolean value)
+# benefits of new defaults and ``scope_type`` together. If ``False``, the
+# deprecated policy check string is logically OR'd with the new policy check
+# string, allowing for a graceful upgrade experience between releases with new
+# policies, which is the default behavior. (boolean value)
 #enforce_new_defaults = false
 
 # The relative or absolute path of a file that maps roles to permissions for a