Merge "Move default_store option in glance-api.conf"

This commit is contained in:
Jenkins 2014-12-24 08:10:18 +00:00 committed by Gerrit Code Review
commit 39b6e7d2cc
2 changed files with 10 additions and 8 deletions

View File

@ -371,7 +371,7 @@ Configuring Glance Storage Backends
There are a number of configuration options in Glance that control how Glance
stores disk images. These configuration options are specified in the
``glance-api.conf`` config file in the section ``[DEFAULT]``.
``glance-api.conf`` config file in the section ``[glance_store]``.
* ``default_store=STORE``

View File

@ -5,12 +5,6 @@
# Show debugging output in logs (sets DEBUG log level output)
#debug = False
# Which backend scheme should Glance use by default is not specified
# in a request to add a new image to Glance? Known schemes are determined
# by the known_stores option below.
# Default: 'file'
default_store = file
# Maximum image size (in bytes) that may be uploaded through the
# Glance API server. Defaults to 1 TB.
# WARNING: this value should only be increased after careful consideration
@ -430,7 +424,7 @@ revocation_cache_time = 10
[store_type_location_strategy]
# The scheme list to use to get store preference order. The scheme must be
# registered by one of the stores defined by the 'known_stores' config option.
# registered by one of the stores defined by the 'stores' config option.
# This option will be applied when you using 'store_type' option as image
# location strategy defined by the 'location_strategy' config option.
#store_type_preference =
@ -461,6 +455,7 @@ revocation_cache_time = 10
[glance_store]
# List of which store classes and store class locations are
# currently known to glance at startup.
# Deprecated group/name - [DEFAULT]/known_stores
# Existing but disabled stores:
# glance.store.rbd.Store,
# glance.store.s3.Store,
@ -472,6 +467,13 @@ revocation_cache_time = 10
#stores = glance.store.filesystem.Store,
# glance.store.http.Store
# Which backend scheme should Glance use by default is not specified
# in a request to add a new image to Glance? Known schemes are determined
# by the stores option.
# Deprecated group/name - [DEFAULT]/default_store
# Default: 'file'
default_store = file
# ============ Filesystem Store Options ========================
# Directory that the Filesystem backend store