From 99124f627f2d8506a652b8d09740658215ef6674 Mon Sep 17 00:00:00 2001 From: Chris Buccella Date: Thu, 6 Nov 2014 13:07:37 -0500 Subject: [PATCH] Move default_store option in glance-api.conf [DEFAULT] default_store was deprecated in Juno and moved into the [glance_store] section. Yet it remains in the old place in the sample glance-api.conf. Additionally, some comments still refer to the known_stores option, which is now simply stores. DocImpact Change-Id: I7215e35534fd9a77730d39b96f9ba3bf6c3ea065 --- doc/source/configuring.rst | 2 +- etc/glance-api.conf | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/doc/source/configuring.rst b/doc/source/configuring.rst index 6e892c918c..8e75aa8bf9 100644 --- a/doc/source/configuring.rst +++ b/doc/source/configuring.rst @@ -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`` diff --git a/etc/glance-api.conf b/etc/glance-api.conf index 839a8bbacf..f00c8b8fcb 100644 --- a/etc/glance-api.conf +++ b/etc/glance-api.conf @@ -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