From: Santhosh <santhom@thoughtworks.com>
Date: Thu, 9 Jun 2011 04:59:30 +0000 (+0530)
Subject: Santhosh/Deepak | Fixed the import issue and config.load_paste_app issue
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fd249e222326a99826f79f018cf565b74451a5f2;p=openstack-build%2Fneutron-build.git

Santhosh/Deepak | Fixed the import issue and config.load_paste_app issue
---

diff --git a/quantum/common/config.py b/quantum/common/config.py
index f2daa417b..320c3b2cf 100644
--- a/quantum/common/config.py
+++ b/quantum/common/config.py
@@ -33,7 +33,6 @@ from paste import deploy
 
 from quantum.common import flags
 from quantum.common import exceptions as exception
-from quantum.common import extensions
 
 DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s"
 DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
diff --git a/quantum/service.py b/quantum/service.py
index 1406462b1..0c27bcc5b 100644
--- a/quantum/service.py
+++ b/quantum/service.py
@@ -102,7 +102,9 @@ def serve_wsgi(cls, conf=None, options=None, args=None):
 
 def _run_wsgi(app_name, paste_conf, paste_config_file):
     LOG.info(_('Using paste.deploy config at: %s'), paste_config_file)
-    app = config.load_paste_app(paste_config_file, app_name)
+    conf, app = config.load_paste_app(app_name,
+                                      {'config_file': paste_config_file},
+                                      None)
     if not app:
         LOG.error(_('No known API applications configured in %s.'),
                       paste_config_file)