openstack/zaqar
Code Issues Proposed changes

Make Paste use default configs

Browse Source 
Instead of specifying a custom location for the Marconi configuration file
through Paste, just use the defaults as specified by our config module.

Change-Id: Ia01e262e298f953412a36c75614c7656c3105db1
Implements: blueprint config-module
This commit is contained in:
Bryan Davidson 2013-04-22 16:28:42 -04:00
parent 0f77d41a96
commit 32150c643e
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/paste.ini-sample
View File

@ -12,4 +12,3 @@ admin_password = %SERVICE_PASSWORD%
[app:marconi] [app:marconi]
paste.app_factory = lib.marconi_paste:WSGI.app_factory paste.app_factory = lib.marconi_paste:WSGI.app_factory
config_file = marconi.conf-sample

3
lib/marconi_paste.py
View File

@ -19,7 +19,6 @@ import marconi
class WSGI(object): class WSGI(object):
@staticmethod @staticmethod
def app_factory(global_config, **local_config): def app_factory(global_config, **local_config):
bootstrap = marconi.Bootstrap(global_config['here'] + '/' + bootstrap = marconi.Bootstrap()
local_config['config_file'])
return bootstrap.transport.app return bootstrap.transport.app