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 --- bin/clear_rabbit_queues | 2 +- bin/nova-ajax-console-proxy | 2 +- bin/nova-direct-api | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/clear_rabbit_queues b/bin/clear_rabbit_queues index f697ef6b4..9d0d803a5 100755 --- a/bin/clear_rabbit_queues +++ b/bin/clear_rabbit_queues @@ -40,11 +40,11 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): gettext.install('nova', unicode=1) -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 rpc from nova import utils diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy index 7dd5266a7..94d93cd0e 100755 --- a/bin/nova-ajax-console-proxy +++ b/bin/nova-ajax-console-proxy @@ -38,9 +38,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): sys.path.insert(0, possible_topdir) -from nova.common import cfg from nova import flags from nova import log as logging +from nova.openstack.common import cfg from nova import rpc from nova import service from nova import utils diff --git a/bin/nova-direct-api b/bin/nova-direct-api index f77311914..6a79ef626 100755 --- a/bin/nova-direct-api +++ b/bin/nova-direct-api @@ -35,11 +35,11 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): sys.path.insert(0, possible_topdir) -from nova.common import cfg from nova import compute from nova import flags from nova import log as logging from nova import network +from nova.openstack.common import cfg from nova import service from nova import utils from nova import volume -- cgit