← Back to branch summary

~salvatore-orlando/neutron/quantum-api

« back to all changes in this revision

Viewing changes to quantum/common/config.py

  • Committer: Salvatore Orlando
  • Date: 2011-06-24 13:52:17 UTC
  • mfrom: (6.1.14 quantum-trunk)
  • Revision ID: salvatore.orlando@eu.citrix.com-20110624135217-h6uz1zu3fxxpf3wt
Merge trunk
Resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
quantum/common/config.py
255
255
                           % (conf_file, e))
256
256
 
257
257
 
258
 
def load_paste_app(conf_file, app_name):
 
258
def load_paste_app(app_name, options, args):
259
259
    """
260
260
    Builds and returns a WSGI app from a paste config file.
261
261
 
276
276
    :raises RuntimeError when config file cannot be located or application
277
277
            cannot be loaded from config file
278
278
    """
279
 
    #conf_file, conf = load_paste_config(app_name, options, args)
 
279
    conf_file, conf = load_paste_config(app_name, options, args)
280
280
 
281
281
    try:
282
 
        conf_file = os.path.abspath(conf_file)
283
282
        app = deploy.loadapp("config:%s" % conf_file, name=app_name)
284
283
    except (LookupError, ImportError), e:
285
284
        raise RuntimeError("Unable to load %(app_name)s from "
286
285
                           "configuration file %(conf_file)s."
287
286
                           "\nGot: %(e)r" % locals())
288
 
    return app
 
287
    return conf, app
289
288
 
290
289
 
291
290
def get_option(options, option, **kwargs):