Merge "Do not load api-paste.ini using oslo.config"
This commit is contained in:
commit
31b51c56aa
|
@ -42,8 +42,7 @@ except ImportError:
|
|||
LOG.debug('Detected not running under uwsgi')
|
||||
uwsgi = None
|
||||
|
||||
CONFIG_FILES = ['glance-api-paste.ini',
|
||||
'glance-image-import.conf',
|
||||
CONFIG_FILES = ['glance-image-import.conf',
|
||||
'glance-api.conf']
|
||||
|
||||
# Reserved file stores for staging and tasks operations
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
The glance-api service no longer attempts to load ``api-paste.ini`` file as
|
||||
its service config file. All config options should be written in service
|
||||
config files such as ``glance-api.conf``.
|
Loading…
Reference in New Issue