From 5677a32c497fc66478ed046bb1f8e84c79b4223b Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Thu, 15 Nov 2012 22:07:55 +0000 Subject: [PATCH] Remove nova.flags imports from bin/* nova.flags is no longer needed except to load nova config options shared across multiple daemons. This removes nova.flags from the bin programs and makes sure that nova.flags is imported in nova.config for now. Change-Id: If066ac0070387bee4b41e6a78ad972f7a0955c75 --- bin/nova-all | 1 - bin/nova-api | 1 - bin/nova-api-ec2 | 1 - bin/nova-api-metadata | 1 - bin/nova-api-os-compute | 1 - bin/nova-cert | 1 - bin/nova-clear-rabbit-queues | 1 - bin/nova-compute | 1 - bin/nova-console | 1 - bin/nova-consoleauth | 1 - bin/nova-dhcpbridge | 1 - bin/nova-manage | 1 - bin/nova-network | 1 - bin/nova-novncproxy | 1 - bin/nova-objectstore | 1 - bin/nova-rpc-zmq-receiver | 1 - bin/nova-scheduler | 1 - bin/nova-xvpvncproxy | 1 - 18 files changed, 18 deletions(-) diff --git a/bin/nova-all b/bin/nova-all index 531116d6..dbbd5088 100755 --- a/bin/nova-all +++ b/bin/nova-all @@ -41,7 +41,6 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import config -from nova import flags from nova.objectstore import s3server from nova.openstack.common import log as logging from nova import service diff --git a/bin/nova-api b/bin/nova-api index 776152e4..5bb7f31b 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -37,7 +37,6 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import config -from nova import flags from nova.openstack.common import log as logging from nova import service from nova import utils diff --git a/bin/nova-api-ec2 b/bin/nova-api-ec2 index f165b5ce..c7b08845 100755 --- a/bin/nova-api-ec2 +++ b/bin/nova-api-ec2 @@ -33,7 +33,6 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import config -from nova import flags from nova.openstack.common import log as logging from nova import service from nova import utils diff --git a/bin/nova-api-metadata b/bin/nova-api-metadata index f50e5ce8..e7cac260 100755 --- a/bin/nova-api-metadata +++ b/bin/nova-api-metadata @@ -33,7 +33,6 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import config -from nova import flags from nova.openstack.common import log as logging from nova import service from nova import utils diff --git a/bin/nova-api-os-compute b/bin/nova-api-os-compute index 5cf5f691..02f16a04 100755 --- a/bin/nova-api-os-compute +++ b/bin/nova-api-os-compute @@ -33,7 +33,6 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import config -from nova import flags from nova.openstack.common import log as logging from nova import service from nova import utils diff --git a/bin/nova-cert b/bin/nova-cert index 441bda9e..ffda0e54 100755 --- a/bin/nova-cert +++ b/bin/nova-cert @@ -33,7 +33,6 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): from nova import config -from nova import flags from nova.openstack.common import log as logging from nova import service from nova import utils diff --git a/bin/nova-clear-rabbit-queues b/bin/nova-clear-rabbit-queues index 66b996c2..90e9128f 100755 --- a/bin/nova-clear-rabbit-queues +++ b/bin/nova-clear-rabbit-queues @@ -43,7 +43,6 @@ gettext.install('nova', unicode=1) from nova import config from nova import context from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common import rpc diff --git a/bin/nova-compute b/bin/nova-compute index f850e1b8..78f4efd2 100755 --- a/bin/nova-compute +++ b/bin/nova-compute @@ -42,7 +42,6 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): from nova import config -from nova import flags from nova.openstack.common import log as logging from nova import service from nova import utils diff --git a/bin/nova-console b/bin/nova-console index c75e088c..6a363c1e 100755 --- a/bin/nova-console +++ b/bin/nova-console @@ -34,7 +34,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): from nova import config -from nova import flags from nova.openstack.common import log as logging from nova import service diff --git a/bin/nova-consoleauth b/bin/nova-consoleauth index 36c9c843..791ac2de 100755 --- a/bin/nova-consoleauth +++ b/bin/nova-consoleauth @@ -33,7 +33,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): 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 fff96506..21cd5db0 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -38,7 +38,6 @@ gettext.install('nova', unicode=1) from nova import config from nova import context from nova import db -from nova import flags from nova.network import linux_net from nova.network import rpcapi as network_rpcapi from nova.openstack.common import importutils diff --git a/bin/nova-manage b/bin/nova-manage index 152042a1..cca67398 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -78,7 +78,6 @@ from nova import context from nova import db from nova.db import migration from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import log as logging diff --git a/bin/nova-network b/bin/nova-network index def7782d..fe90e4cc 100755 --- a/bin/nova-network +++ b/bin/nova-network @@ -35,7 +35,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): from nova import config -from nova import flags from nova.openstack.common import log as logging from nova import service from nova import utils diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy index 1ba43aa0..ad901656 100755 --- a/bin/nova-novncproxy +++ b/bin/nova-novncproxy @@ -31,7 +31,6 @@ import websockify from nova import config from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common import rpc diff --git a/bin/nova-objectstore b/bin/nova-objectstore index 9b9e2b7a..8ec9fbf3 100755 --- a/bin/nova-objectstore +++ b/bin/nova-objectstore @@ -35,7 +35,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): from nova import config -from nova import flags from nova.objectstore import s3server from nova.openstack.common import log as logging from nova import service diff --git a/bin/nova-rpc-zmq-receiver b/bin/nova-rpc-zmq-receiver index d6849ce9..e9093f1a 100755 --- a/bin/nova-rpc-zmq-receiver +++ b/bin/nova-rpc-zmq-receiver @@ -34,7 +34,6 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): from nova import config from nova import exception -from nova import flags from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova.openstack.common.rpc import impl_zmq diff --git a/bin/nova-scheduler b/bin/nova-scheduler index 73dfab20..7730c5cb 100755 --- a/bin/nova-scheduler +++ b/bin/nova-scheduler @@ -37,7 +37,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): gettext.install('nova', unicode=1) from nova import config -from nova import flags from nova.openstack.common import log as logging from nova import service from nova import utils diff --git a/bin/nova-xvpvncproxy b/bin/nova-xvpvncproxy index b816bf2e..7882645a 100755 --- a/bin/nova-xvpvncproxy +++ b/bin/nova-xvpvncproxy @@ -32,7 +32,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): from nova import config -from nova import flags from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova import service