From a3318d88f27733e03dc2aab55de2f9067fa21a76 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 9 Nov 2012 12:17:13 -0500 Subject: [PATCH] Fix import ordering in /bin scripts. Fix a couple hacking violations in Nova's bin scripts. Change-Id: I5cab72a5a94f761f429ad45f94a95cd4bc7e30e8 --- bin/nova-clear-rabbit-queues | 2 +- bin/nova-consoleauth | 2 +- bin/nova-dhcpbridge | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/nova-clear-rabbit-queues b/bin/nova-clear-rabbit-queues index be1d98e3e5a7..66b996c2e25c 100755 --- a/bin/nova-clear-rabbit-queues +++ b/bin/nova-clear-rabbit-queues @@ -40,9 +40,9 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): gettext.install('nova', unicode=1) +from nova import config from nova import context from nova import exception -from nova import config from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging diff --git a/bin/nova-consoleauth b/bin/nova-consoleauth index 654a3f82460b..36c9c843bdc4 100755 --- a/bin/nova-consoleauth +++ b/bin/nova-consoleauth @@ -31,8 +31,8 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): sys.path.insert(0, possible_topdir) -from nova.consoleauth import manager from nova import config +from nova.consoleauth import manager from nova import flags from nova.openstack.common import log as logging from nova import service diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index ed36c47bc6bd..fff965064c90 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -35,9 +35,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): gettext.install('nova', unicode=1) +from nova import config from nova import context from nova import db -from nova import config from nova import flags from nova.network import linux_net from nova.network import rpcapi as network_rpcapi