openstack/glance
Code Issues Proposed changes

Refresh Glance example configs for Ussuri milestone 1

Browse Source 
Change-Id: Iaac5c65f10f39027dd191b2397d8e5141bc9e12d
This commit is contained in:
Abhishek Kekane 2019-12-19 16:30:17 +00:00
parent 40bd312410
commit 0eacf2da18
2 changed files with 12 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
etc/glance-api.conf
View File

@ -896,76 +896,6 @@
# Minimum value: 1 # Minimum value: 1
#tcp_keepidle = 600 #tcp_keepidle = 600
#
# Absolute path to the CA file.
#
# Provide a string value representing a valid absolute path to
# the Certificate Authority file to use for client authentication.
#
# A CA file typically contains necessary trusted certificates to
# use for the client authentication. This is essential to ensure
# that a secure connection is established to the server via the
# internet.
#
# Possible values:
# * Valid absolute path to the CA file
#
# Related options:
# * None
#
# (string value)
#
# This option has a sample default set, which means that
# its actual default value may vary from the one documented
# below.
#ca_file = /etc/ssl/cafile
#
# Absolute path to the certificate file.
#
# Provide a string value representing a valid absolute path to the
# certificate file which is required to start the API service
# securely.
#
# A certificate file typically is a public key container and includes
# the server's public key, server name, server information and the
# signature which was a result of the verification process using the
# CA certificate. This is required for a secure connection
# establishment.
#
# Possible values:
# * Valid absolute path to the certificate file
#
# Related options:
# * None
#
# (string value)
#
# This option has a sample default set, which means that
# its actual default value may vary from the one documented
# below.
#cert_file = /etc/ssl/certs
#
# Absolute path to a private key file.
#
# Provide a string value representing a valid absolute path to a
# private key file which is required to establish the client-server
# connection.
#
# Possible values:
# * Absolute path to the private key file
#
# Related options:
# * None
#
# (string value)
#
# This option has a sample default set, which means that
# its actual default value may vary from the one documented
# below.
#key_file = /etc/ssl/key/key-file.pem
# DEPRECATED: The HTTP header used to determine the scheme for the original # DEPRECATED: The HTTP header used to determine the scheme for the original
# request, even if it was removed by an SSL terminating proxy. Typical value is # request, even if it was removed by an SSL terminating proxy. Typical value is
# "HTTP_X_FORWARDED_PROTO". (string value) # "HTTP_X_FORWARDED_PROTO". (string value)
@ -5352,11 +5282,11 @@
# Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_ca_certs # Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_ca_certs
#ssl_ca_file = #ssl_ca_file =
# EXPERIMENTAL: Run the health check heartbeat threadthrough a native python # EXPERIMENTAL: Run the health check heartbeat thread through a native python
# thread. By default if thisoption isn't provided the health check heartbeat # thread. By default if this option isn't provided the health check heartbeat
# willinherit the execution model from the parent process. Byexample if the # will inherit the execution model from the parent process. By example if the
# parent process have monkey patched thestdlib by using eventlet/greenlet then # parent process have monkey patched the stdlib by using eventlet/greenlet then
# the heartbeatwill be run through a green thread. (boolean value) # the heartbeat will be run through a green thread. (boolean value)
#heartbeat_in_pthread = false #heartbeat_in_pthread = false
# How long to wait before reconnecting in response to an AMQP consumer cancel # How long to wait before reconnecting in response to an AMQP consumer cancel
@ -5425,7 +5355,7 @@
#heartbeat_rate = 2 #heartbeat_rate = 2
# Enable/Disable the RabbitMQ mandatory flag for direct send. The direct send is # 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 # used as reply, so the MessageUndeliverable exception is raised in case the
# client queue does not exist. (integer value) # client queue does not exist. (integer value)
#direct_mandatory_flag = True #direct_mandatory_flag = True

82
etc/glance-registry.conf
View File

@ -673,76 +673,6 @@
# Minimum value: 1 # Minimum value: 1
#tcp_keepidle = 600 #tcp_keepidle = 600
#
# Absolute path to the CA file.
#
# Provide a string value representing a valid absolute path to
# the Certificate Authority file to use for client authentication.
#
# A CA file typically contains necessary trusted certificates to
# use for the client authentication. This is essential to ensure
# that a secure connection is established to the server via the
# internet.
#
# Possible values:
# * Valid absolute path to the CA file
#
# Related options:
# * None
#
# (string value)
#
# This option has a sample default set, which means that
# its actual default value may vary from the one documented
# below.
#ca_file = /etc/ssl/cafile
#
# Absolute path to the certificate file.
#
# Provide a string value representing a valid absolute path to the
# certificate file which is required to start the API service
# securely.
#
# A certificate file typically is a public key container and includes
# the server's public key, server name, server information and the
# signature which was a result of the verification process using the
# CA certificate. This is required for a secure connection
# establishment.
#
# Possible values:
# * Valid absolute path to the certificate file
#
# Related options:
# * None
#
# (string value)
#
# This option has a sample default set, which means that
# its actual default value may vary from the one documented
# below.
#cert_file = /etc/ssl/certs
#
# Absolute path to a private key file.
#
# Provide a string value representing a valid absolute path to a
# private key file which is required to establish the client-server
# connection.
#
# Possible values:
# * Absolute path to the private key file
#
# Related options:
# * None
#
# (string value)
#
# This option has a sample default set, which means that
# its actual default value may vary from the one documented
# below.
#key_file = /etc/ssl/key/key-file.pem
# DEPRECATED: The HTTP header used to determine the scheme for the original # DEPRECATED: The HTTP header used to determine the scheme for the original
# request, even if it was removed by an SSL terminating proxy. Typical value is # request, even if it was removed by an SSL terminating proxy. Typical value is
# "HTTP_X_FORWARDED_PROTO". (string value) # "HTTP_X_FORWARDED_PROTO". (string value)
@ -1628,11 +1558,11 @@
# Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_ca_certs # Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_ca_certs
#ssl_ca_file = #ssl_ca_file =
# EXPERIMENTAL: Run the health check heartbeat threadthrough a native python # EXPERIMENTAL: Run the health check heartbeat thread through a native python
# thread. By default if thisoption isn't provided the health check heartbeat # thread. By default if this option isn't provided the health check heartbeat
# willinherit the execution model from the parent process. Byexample if the # will inherit the execution model from the parent process. By example if the
# parent process have monkey patched thestdlib by using eventlet/greenlet then # parent process have monkey patched the stdlib by using eventlet/greenlet then
# the heartbeatwill be run through a green thread. (boolean value) # the heartbeat will be run through a green thread. (boolean value)
#heartbeat_in_pthread = false #heartbeat_in_pthread = false
# How long to wait before reconnecting in response to an AMQP consumer cancel # How long to wait before reconnecting in response to an AMQP consumer cancel
@ -1701,7 +1631,7 @@
#heartbeat_rate = 2 #heartbeat_rate = 2
# Enable/Disable the RabbitMQ mandatory flag for direct send. The direct send is # 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 # used as reply, so the MessageUndeliverable exception is raised in case the
# client queue does not exist. (integer value) # client queue does not exist. (integer value)
#direct_mandatory_flag = True #direct_mandatory_flag = True