From e1e2fd0bf964d7b9f84601d74e5cc4c25e2a697e Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Tue, 11 Dec 2012 07:26:17 +0000
Subject: [PATCH] Move api_paste_config option into nova.wsgi

The api_paste_config option is only used in nova.wsgi so we can
have it be registered there too.

blueprint: scope-config-opts
Change-Id: I438102b2524bd96faf8392f3ba600235ce7116a4
---
 nova/wsgi.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nova/wsgi.py b/nova/wsgi.py
index 19dcd2d60..e7e731523 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -35,6 +35,9 @@ from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 
 wsgi_opts = [
+    cfg.StrOpt('api_paste_config',
+               default="api-paste.ini",
+               help='File name for the paste.deploy config for nova-api'),
     cfg.StrOpt('wsgi_log_format',
             default='%(client_ip)s "%(request_line)s" status: %(status_code)s'
                     ' len: %(body_length)s time: %(wall_seconds).7f',
@@ -45,7 +48,6 @@ wsgi_opts = [
     ]
 CONF = cfg.CONF
 CONF.register_opts(wsgi_opts)
-CONF.import_opt('api_paste_config', 'nova.config')
 
 LOG = logging.getLogger(__name__)