From 9871c5f963b6d98240635a9a447d14d46133c910 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Fri, 3 Feb 2012 00:50:58 +0000
Subject: Move cfg to nova.openstack.common

Move it here so that it can be kept in sync with openstack-common using
the new update.py script for code in openstack-common's incubation area.

See here for more details:

  http://wiki.openstack.org/CommonLibrary#Incubation

Note: this commit just moves the existing code in Nova with no other
changes. A subsequent commit will sync it with latest openstack-common
so that it is easier see the new changes.

Change-Id: If88d678b1b9bad3d37117de7f7159d7fea8ab4c8
---
 nova/api/auth.py                       | 2 +-
 nova/api/ec2/__init__.py               | 2 +-
 nova/api/openstack/compute/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/auth.py b/nova/api/auth.py
index 84ba3376d..cb601bdb3 100644
--- a/nova/api/auth.py
+++ b/nova/api/auth.py
@@ -21,10 +21,10 @@ Common Auth Middleware.
 import webob.dec
 import webob.exc
 
-from nova.common import cfg
 from nova import context
 from nova import flags
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova import wsgi
 
 
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index dfcddbc4e..c9e499f1d 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -32,11 +32,11 @@ from nova.api.ec2 import ec2utils
 from nova.api.ec2 import faults
 from nova.api import validator
 from nova.auth import manager
-from nova.common import cfg
 from nova import context
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova import utils
 from nova import wsgi
 
diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py
index d035173ed..3884ffbad 100644
--- a/nova/api/openstack/compute/__init__.py
+++ b/nova/api/openstack/compute/__init__.py
@@ -31,9 +31,9 @@ from nova.api.openstack.compute import limits
 from nova.api.openstack.compute import servers
 from nova.api.openstack.compute import server_metadata
 from nova.api.openstack.compute import versions
-from nova.common import cfg
 from nova import flags
 from nova import log as logging
+from nova.openstack.common import cfg
 
 
 LOG = logging.getLogger('nova.api.openstack.compute')
-- 
cgit