diff options
| -rw-r--r-- | etc/glance-api.conf | 127 | ||||
| -rw-r--r-- | etc/glance-cache.conf | 4 | ||||
| -rw-r--r-- | etc/glance-glare.conf | 34 | ||||
| -rw-r--r-- | etc/glance-registry.conf | 127 | ||||
| -rw-r--r-- | etc/glance-scrubber.conf | 4 |
5 files changed, 272 insertions, 24 deletions
diff --git a/etc/glance-api.conf b/etc/glance-api.conf index 8cb85d9a9..73b5b80a5 100644 --- a/etc/glance-api.conf +++ b/etc/glance-api.conf @@ -321,8 +321,8 @@ # (boolean value) # This option is deprecated for removal since Newton. # Its value may be silently ignored in the future. -# Reason: This option will be removed in the Ocata release because the same -# functionality can be achieved with greater granularity by using policies. +# Reason: This option will be removed in the Pike release or later because the +# same functionality can be achieved with greater granularity by using policies. # Please see the Newton release notes for more information. #show_multiple_locations = false @@ -1619,7 +1619,16 @@ # Use ROUTER remote proxy. (boolean value) # Deprecated group/name - [DEFAULT]/use_router_proxy -#use_router_proxy = true +#use_router_proxy = false + +# This option makes direct connections dynamic or static. It makes sense only +# with use_router_proxy=False which means to use direct connections for direct +# message types (ignored otherwise). (boolean value) +#use_dynamic_connections = false + +# How many additional connections to a host will be made for failover reasons. +# This option is actual only in dynamic connections mode. (integer value) +#zmq_failover_connections = 2 # Minimal port number for random ports range. (port value) # Minimum value: 0 @@ -3525,15 +3534,16 @@ # Deprecated group/name - [amqp1]/trace #trace = false -# CA certificate PEM file to verify server certificate (string value) +# CA certificate PEM file used to verify the server's certificate (string value) # Deprecated group/name - [amqp1]/ssl_ca_file #ssl_ca_file = -# Identifying certificate PEM file to present to clients (string value) +# Self-identifying certificate PEM file for client authentication (string value) # Deprecated group/name - [amqp1]/ssl_cert_file #ssl_cert_file = -# Private key PEM file used to sign cert_file certificate (string value) +# Private key PEM file used to sign ssl_cert_file certificate (optional) (string +# value) # Deprecated group/name - [amqp1]/ssl_key_file #ssl_key_file = @@ -3541,8 +3551,11 @@ # Deprecated group/name - [amqp1]/ssl_key_password #ssl_key_password = <None> -# Accept clients using either SSL or plain TCP (boolean value) +# DEPRECATED: Accept clients using either SSL or plain TCP (boolean value) # Deprecated group/name - [amqp1]/allow_insecure_clients +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: Not applicable - not a SSL server #allow_insecure_clients = false # Space separated list of acceptable SASL mechanisms (string value) @@ -3584,8 +3597,12 @@ # Minimum value: 1 #link_retry_delay = 10 -# The deadline for an rpc reply message delivery. Only used when caller does not -# provide a timeout expiry. (integer value) +# The maximum number of attempts to re-send a reply message which failed due to +# a recoverable error. (integer value) +# Minimum value: -1 +#default_reply_retry = 0 + +# The deadline for an rpc reply message delivery. (integer value) # Minimum value: 5 #default_reply_timeout = 30 @@ -3686,6 +3703,53 @@ #pre_settled = rpc-reply +[oslo_messaging_kafka] + +# +# From oslo.messaging +# + +# DEPRECATED: Default Kafka broker Host (string value) +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: Replaced by [DEFAULT]/transport_url +#kafka_default_host = localhost + +# DEPRECATED: Default Kafka broker Port (port value) +# Minimum value: 0 +# Maximum value: 65535 +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: Replaced by [DEFAULT]/transport_url +#kafka_default_port = 9092 + +# Max fetch bytes of Kafka consumer (integer value) +#kafka_max_fetch_bytes = 1048576 + +# Default timeout(s) for Kafka consumers (integer value) +#kafka_consumer_timeout = 1.0 + +# Pool Size for Kafka Consumers (integer value) +#pool_size = 10 + +# The pool size limit for connections expiration policy (integer value) +#conn_pool_min_size = 2 + +# The time-to-live in sec of idle connections in the pool (integer value) +#conn_pool_ttl = 1200 + +# Group id for Kafka consumer. Consumers in one group will coordinate message +# consumption (string value) +#consumer_group = oslo_messaging_consumer + +# Upper bound on the delay for KafkaProducer batching in seconds (floating point +# value) +#producer_batch_timeout = 0.0 + +# Size of batch for the producer async send (integer value) +#producer_batch_size = 16384 + + [oslo_messaging_notifications] # @@ -4036,7 +4100,16 @@ # Use ROUTER remote proxy. (boolean value) # Deprecated group/name - [DEFAULT]/use_router_proxy -#use_router_proxy = true +#use_router_proxy = false + +# This option makes direct connections dynamic or static. It makes sense only +# with use_router_proxy=False which means to use direct connections for direct +# message types (ignored otherwise). (boolean value) +#use_dynamic_connections = false + +# How many additional connections to a host will be made for failover reasons. +# This option is actual only in dynamic connections mode. (integer value) +#zmq_failover_connections = 2 # Minimal port number for random ports range. (port value) # Minimum value: 0 @@ -4274,9 +4347,43 @@ # Examples of possible values: # # * messaging://: use oslo_messaging driver for sending notifications. +# * mongodb://127.0.0.1:27017 : use mongodb driver for sending notifications. +# * elasticsearch://127.0.0.1:9200 : use elasticsearch driver for sending +# notifications. # (string value) #connection_string = messaging:// +# +# Document type for notification indexing in elasticsearch. +# (string value) +#es_doc_type = notification + +# +# This parameter is a time value parameter (for example: es_scroll_time=2m), +# indicating for how long the nodes that participate in the search will maintain +# relevant resources in order to continue and support it. +# (string value) +#es_scroll_time = 2m + +# +# Elasticsearch splits large requests in batches. This parameter defines +# maximum size of each batch (for example: es_scroll_size=10000). +# (integer value) +#es_scroll_size = 10000 + +# +# Redissentinel provides a timeout option on the connections. +# This parameter defines that timeout (for example: socket_timeout=0.1). +# (floating point value) +#socket_timeout = 0.1 + +# +# Redissentinel uses a service name to identify a master redis service. +# This parameter defines the name (for example: +# sentinal_service_name=mymaster). +# (string value) +#sentinel_service_name = mymaster + [store_type_location_strategy] diff --git a/etc/glance-cache.conf b/etc/glance-cache.conf index 738ef5f74..56a202114 100644 --- a/etc/glance-cache.conf +++ b/etc/glance-cache.conf @@ -226,8 +226,8 @@ # (boolean value) # This option is deprecated for removal since Newton. # Its value may be silently ignored in the future. -# Reason: This option will be removed in the Ocata release because the same -# functionality can be achieved with greater granularity by using policies. +# Reason: This option will be removed in the Pike release or later because the +# same functionality can be achieved with greater granularity by using policies. # Please see the Newton release notes for more information. #show_multiple_locations = false diff --git a/etc/glance-glare.conf b/etc/glance-glare.conf index 1c158f677..5b83e1dfa 100644 --- a/etc/glance-glare.conf +++ b/etc/glance-glare.conf @@ -2302,5 +2302,39 @@ # Examples of possible values: # # * messaging://: use oslo_messaging driver for sending notifications. +# * mongodb://127.0.0.1:27017 : use mongodb driver for sending notifications. +# * elasticsearch://127.0.0.1:9200 : use elasticsearch driver for sending +# notifications. # (string value) #connection_string = messaging:// + +# +# Document type for notification indexing in elasticsearch. +# (string value) +#es_doc_type = notification + +# +# This parameter is a time value parameter (for example: es_scroll_time=2m), +# indicating for how long the nodes that participate in the search will maintain +# relevant resources in order to continue and support it. +# (string value) +#es_scroll_time = 2m + +# +# Elasticsearch splits large requests in batches. This parameter defines +# maximum size of each batch (for example: es_scroll_size=10000). +# (integer value) +#es_scroll_size = 10000 + +# +# Redissentinel provides a timeout option on the connections. +# This parameter defines that timeout (for example: socket_timeout=0.1). +# (floating point value) +#socket_timeout = 0.1 + +# +# Redissentinel uses a service name to identify a master redis service. +# This parameter defines the name (for example: +# sentinal_service_name=mymaster). +# (string value) +#sentinel_service_name = mymaster diff --git a/etc/glance-registry.conf b/etc/glance-registry.conf index 33d87cf04..1357d02ba 100644 --- a/etc/glance-registry.conf +++ b/etc/glance-registry.conf @@ -300,8 +300,8 @@ # (boolean value) # This option is deprecated for removal since Newton. # Its value may be silently ignored in the future. -# Reason: This option will be removed in the Ocata release because the same -# functionality can be achieved with greater granularity by using policies. +# Reason: This option will be removed in the Pike release or later because the +# same functionality can be achieved with greater granularity by using policies. # Please see the Newton release notes for more information. #show_multiple_locations = false @@ -967,7 +967,16 @@ # Use ROUTER remote proxy. (boolean value) # Deprecated group/name - [DEFAULT]/use_router_proxy -#use_router_proxy = true +#use_router_proxy = false + +# This option makes direct connections dynamic or static. It makes sense only +# with use_router_proxy=False which means to use direct connections for direct +# message types (ignored otherwise). (boolean value) +#use_dynamic_connections = false + +# How many additional connections to a host will be made for failover reasons. +# This option is actual only in dynamic connections mode. (integer value) +#zmq_failover_connections = 2 # Minimal port number for random ports range. (port value) # Minimum value: 0 @@ -1430,15 +1439,16 @@ # Deprecated group/name - [amqp1]/trace #trace = false -# CA certificate PEM file to verify server certificate (string value) +# CA certificate PEM file used to verify the server's certificate (string value) # Deprecated group/name - [amqp1]/ssl_ca_file #ssl_ca_file = -# Identifying certificate PEM file to present to clients (string value) +# Self-identifying certificate PEM file for client authentication (string value) # Deprecated group/name - [amqp1]/ssl_cert_file #ssl_cert_file = -# Private key PEM file used to sign cert_file certificate (string value) +# Private key PEM file used to sign ssl_cert_file certificate (optional) (string +# value) # Deprecated group/name - [amqp1]/ssl_key_file #ssl_key_file = @@ -1446,8 +1456,11 @@ # Deprecated group/name - [amqp1]/ssl_key_password #ssl_key_password = <None> -# Accept clients using either SSL or plain TCP (boolean value) +# DEPRECATED: Accept clients using either SSL or plain TCP (boolean value) # Deprecated group/name - [amqp1]/allow_insecure_clients +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: Not applicable - not a SSL server #allow_insecure_clients = false # Space separated list of acceptable SASL mechanisms (string value) @@ -1489,8 +1502,12 @@ # Minimum value: 1 #link_retry_delay = 10 -# The deadline for an rpc reply message delivery. Only used when caller does not -# provide a timeout expiry. (integer value) +# The maximum number of attempts to re-send a reply message which failed due to +# a recoverable error. (integer value) +# Minimum value: -1 +#default_reply_retry = 0 + +# The deadline for an rpc reply message delivery. (integer value) # Minimum value: 5 #default_reply_timeout = 30 @@ -1591,6 +1608,53 @@ #pre_settled = rpc-reply +[oslo_messaging_kafka] + +# +# From oslo.messaging +# + +# DEPRECATED: Default Kafka broker Host (string value) +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: Replaced by [DEFAULT]/transport_url +#kafka_default_host = localhost + +# DEPRECATED: Default Kafka broker Port (port value) +# Minimum value: 0 +# Maximum value: 65535 +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: Replaced by [DEFAULT]/transport_url +#kafka_default_port = 9092 + +# Max fetch bytes of Kafka consumer (integer value) +#kafka_max_fetch_bytes = 1048576 + +# Default timeout(s) for Kafka consumers (integer value) +#kafka_consumer_timeout = 1.0 + +# Pool Size for Kafka Consumers (integer value) +#pool_size = 10 + +# The pool size limit for connections expiration policy (integer value) +#conn_pool_min_size = 2 + +# The time-to-live in sec of idle connections in the pool (integer value) +#conn_pool_ttl = 1200 + +# Group id for Kafka consumer. Consumers in one group will coordinate message +# consumption (string value) +#consumer_group = oslo_messaging_consumer + +# Upper bound on the delay for KafkaProducer batching in seconds (floating point +# value) +#producer_batch_timeout = 0.0 + +# Size of batch for the producer async send (integer value) +#producer_batch_size = 16384 + + [oslo_messaging_notifications] # @@ -1941,7 +2005,16 @@ # Use ROUTER remote proxy. (boolean value) # Deprecated group/name - [DEFAULT]/use_router_proxy -#use_router_proxy = true +#use_router_proxy = false + +# This option makes direct connections dynamic or static. It makes sense only +# with use_router_proxy=False which means to use direct connections for direct +# message types (ignored otherwise). (boolean value) +#use_dynamic_connections = false + +# How many additional connections to a host will be made for failover reasons. +# This option is actual only in dynamic connections mode. (integer value) +#zmq_failover_connections = 2 # Minimal port number for random ports range. (port value) # Minimum value: 0 @@ -2168,5 +2241,39 @@ # Examples of possible values: # # * messaging://: use oslo_messaging driver for sending notifications. +# * mongodb://127.0.0.1:27017 : use mongodb driver for sending notifications. +# * elasticsearch://127.0.0.1:9200 : use elasticsearch driver for sending +# notifications. # (string value) #connection_string = messaging:// + +# +# Document type for notification indexing in elasticsearch. +# (string value) +#es_doc_type = notification + +# +# This parameter is a time value parameter (for example: es_scroll_time=2m), +# indicating for how long the nodes that participate in the search will maintain +# relevant resources in order to continue and support it. +# (string value) +#es_scroll_time = 2m + +# +# Elasticsearch splits large requests in batches. This parameter defines +# maximum size of each batch (for example: es_scroll_size=10000). +# (integer value) +#es_scroll_size = 10000 + +# +# Redissentinel provides a timeout option on the connections. +# This parameter defines that timeout (for example: socket_timeout=0.1). +# (floating point value) +#socket_timeout = 0.1 + +# +# Redissentinel uses a service name to identify a master redis service. +# This parameter defines the name (for example: +# sentinal_service_name=mymaster). +# (string value) +#sentinel_service_name = mymaster diff --git a/etc/glance-scrubber.conf b/etc/glance-scrubber.conf index d7de729d4..f375661be 100644 --- a/etc/glance-scrubber.conf +++ b/etc/glance-scrubber.conf @@ -226,8 +226,8 @@ # (boolean value) # This option is deprecated for removal since Newton. # Its value may be silently ignored in the future. -# Reason: This option will be removed in the Ocata release because the same -# functionality can be achieved with greater granularity by using policies. +# Reason: This option will be removed in the Pike release or later because the +# same functionality can be achieved with greater granularity by using policies. # Please see the Newton release notes for more information. #show_multiple_locations = false |