Merge "Remove nova.flags imports from scheduler code"

nova/scheduler/baremetal_host_manager.py

@@ -18,15 +18,9 @@
 Manage hosts in the current zone.
 """
 
-from nova import flags
-from nova.openstack.common import log as logging
 from nova.scheduler import host_manager
 
 
-FLAGS = flags.FLAGS
-LOG = logging.getLogger(__name__)
-
-
 class BaremetalNodeState(host_manager.HostState):
     """Mutable and immutable information tracked for a host.
     This is an attempt to remove the ad-hoc data structures

nova/scheduler/chance.py

@@ -25,7 +25,6 @@ import random
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.scheduler import driver
 
 CONF = config.CONF

nova/scheduler/driver.py

@@ -31,7 +31,6 @@ from nova.compute import vm_states
 from nova import config
 from nova import db
 from nova import exception
-from nova import flags
 from nova import notifications
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils

nova/scheduler/manager.py

@@ -30,7 +30,6 @@ from nova import config
 import nova.context
 from nova import db
 from nova import exception
-from nova import flags
 from nova import manager
 from nova import notifications
 from nova.openstack.common import cfg

nova/scheduler/multi.py

@@ -28,7 +28,6 @@ https://bugs.launchpad.net/nova/+bug/1009681
 """
 
 from nova import config
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.scheduler import driver

nova/scheduler/rpcapi.py

@@ -19,7 +19,6 @@ Client side of the scheduler manager RPC API.
 """
 
 from nova import config
-from nova import flags
 from nova.openstack.common import jsonutils
 import nova.openstack.common.rpc.proxy
 

nova/scheduler/scheduler_options.py

@@ -27,7 +27,6 @@ import json
 import os
 
 from nova import config
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils