From 8ce58defbe560b1da34d991b38ac64a9b4c8d654 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Mon, 15 Oct 2012 02:03:34 +0100
Subject: Remove flags.DECLARE

The cfg.ConfigOpts class has an equivalent method, so lets use that.

Change-Id: I5860230336d00d7531a0ffd255c766ff77661625
---
 nova/api/ec2/__init__.py     | 4 +++-
 nova/api/metadata/base.py    | 4 +++-
 nova/api/metadata/handler.py | 4 +++-
 nova/api/openstack/auth.py   | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index d1145420e..b1ec45864 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -31,6 +31,7 @@ from nova.api.ec2 import apirequest
 from nova.api.ec2 import ec2utils
 from nova.api.ec2 import faults
 from nova.api import validator
+from nova import config
 from nova import context
 from nova import exception
 from nova import flags
@@ -74,7 +75,8 @@ ec2_opts = [
 FLAGS = flags.FLAGS
 FLAGS.register_opts(ec2_opts)
 
-flags.DECLARE('use_forwarded_for', 'nova.api.auth')
+CONF = config.CONF
+CONF.import_opt('use_forwarded_for', 'nova.api.auth')
 
 
 def ec2_error(req, request_id, code, message):
diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py
index 6a472df58..5252641fb 100644
--- a/nova/api/metadata/base.py
+++ b/nova/api/metadata/base.py
@@ -24,6 +24,7 @@ import os
 
 from nova.api.ec2 import ec2utils
 from nova import block_device
+from nova import config
 from nova import context
 from nova import db
 from nova import flags
@@ -41,8 +42,9 @@ metadata_opts = [
     ]
 
 FLAGS = flags.FLAGS
-flags.DECLARE('dhcp_domain', 'nova.network.manager')
 FLAGS.register_opts(metadata_opts)
+CONF = config.CONF
+CONF.import_opt('dhcp_domain', 'nova.network.manager')
 
 
 VERSIONS = [
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index d022cbc82..25f40e592 100644
--- a/nova/api/metadata/handler.py
+++ b/nova/api/metadata/handler.py
@@ -23,6 +23,7 @@ import webob.dec
 import webob.exc
 
 from nova.api.metadata import base
+from nova import config
 from nova import exception
 from nova import flags
 from nova.openstack.common import log as logging
@@ -30,7 +31,8 @@ from nova import wsgi
 
 LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
-flags.DECLARE('use_forwarded_for', 'nova.api.auth')
+CONF = config.CONF
+CONF.import_opt('use_forwarded_for', 'nova.api.auth')
 
 if FLAGS.memcached_servers:
     import memcache
diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py
index 078d58639..8bb8bacae 100644
--- a/nova/api/openstack/auth.py
+++ b/nova/api/openstack/auth.py
@@ -21,6 +21,7 @@ import webob.dec
 import webob.exc
 
 from nova.api.openstack import wsgi
+from nova import config
 from nova import context
 from nova import flags
 from nova.openstack.common import log as logging
@@ -28,7 +29,8 @@ from nova import wsgi as base_wsgi
 
 LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
-flags.DECLARE('use_forwarded_for', 'nova.api.auth')
+CONF = config.CONF
+CONF.import_opt('use_forwarded_for', 'nova.api.auth')
 
 
 class NoAuthMiddleware(base_wsgi.Middleware):
-- 
cgit