From e18bc3944e9223edc0147c772daf5566cf698575 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 531116d69..dbbd50887 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 776152e43..5bb7f31b7 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 f165b5ce9..c7b08845d 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 f50e5ce84..e7cac260d 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 5cf5f6910..02f16a04a 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 441bda9e5..ffda0e547 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 66b996c2e..90e9128f3 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 f850e1b8c..78f4efd20 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 c75e088c8..6a363c1e7 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 36c9c843b..791ac2de5 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 fff965064..21cd5db00 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 152042a1d..cca67398c 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 def7782d7..fe90e4cce 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 1ba43aa01..ad901656d 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 9b9e2b7a7..8ec9fbf35 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 d6849ce9d..e9093f1a5 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 73dfab207..7730c5cb0 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 b816bf2e9..7882645ad 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