From 9871c5f963b6d98240635a9a447d14d46133c910 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin 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/compute/api.py | 2 +- nova/compute/manager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 42c4ea4f0..f54d184dd 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -28,7 +28,6 @@ import novaclient import webob.exc from nova import block_device -from nova.common import cfg from nova.compute import aggregate_states from nova.compute import instance_types from nova.compute import power_state @@ -40,6 +39,7 @@ from nova import flags import nova.image from nova import log as logging from nova import network +from nova.openstack.common import cfg import nova.policy from nova import quota from nova import rpc diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 0d49a19c4..64401eeca 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -45,7 +45,6 @@ from eventlet import greenthread from nova import block_device import nova.context -from nova.common import cfg from nova.compute import instance_types from nova.compute import power_state from nova.compute import task_states @@ -59,6 +58,7 @@ from nova import manager from nova import network from nova.network import model as network_model from nova.notifier import api as notifier +from nova.openstack.common import cfg from nova import rpc from nova import utils from nova.virt import driver -- cgit