summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2012-11-15 21:45:59 +0000
committerChris Behrens <cbehrens@codestud.com>2012-11-15 23:03:04 +0000
commit1cd7ba8a2b32bce49e3e8b9468fe69c398337b1e (patch)
tree64587215cabdf3af1289c00a3a0db214258f4dcb
parentc9575fd93166e0af5b0e0f832f9307d9c60c127b (diff)
downloadnova-1cd7ba8a2b32bce49e3e8b9468fe69c398337b1e.tar.gz
nova-1cd7ba8a2b32bce49e3e8b9468fe69c398337b1e.tar.xz
nova-1cd7ba8a2b32bce49e3e8b9468fe69c398337b1e.zip
Remove nova.flags imports from scheduler code
nova.flags is no longer needed. nova.config is now used. Removes FLAGS and LOG from baremetal_host_manager completely, which doesn't use them. Change-Id: Ia1a4597e28e8ebb8adc5a77b8b006aabe354ac15
-rw-r--r--nova/scheduler/baremetal_host_manager.py6
-rw-r--r--nova/scheduler/chance.py1
-rw-r--r--nova/scheduler/driver.py1
-rw-r--r--nova/scheduler/manager.py1
-rw-r--r--nova/scheduler/multi.py1
-rw-r--r--nova/scheduler/rpcapi.py1
-rw-r--r--nova/scheduler/scheduler_options.py1
7 files changed, 0 insertions, 12 deletions
diff --git a/nova/scheduler/baremetal_host_manager.py b/nova/scheduler/baremetal_host_manager.py
index df2261c32..fdf482de7 100644
--- a/nova/scheduler/baremetal_host_manager.py
+++ b/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
diff --git a/nova/scheduler/chance.py b/nova/scheduler/chance.py
index 1a608da29..86e21929c 100644
--- a/nova/scheduler/chance.py
+++ b/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
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py
index e9cbd509b..39ea55527 100644
--- a/nova/scheduler/driver.py
+++ b/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
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py
index 77f5a0259..3ef2992fb 100644
--- a/nova/scheduler/manager.py
+++ b/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
diff --git a/nova/scheduler/multi.py b/nova/scheduler/multi.py
index 7c68bb12a..988881632 100644
--- a/nova/scheduler/multi.py
+++ b/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
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py
index cbb6712db..b0c83d695 100644
--- a/nova/scheduler/rpcapi.py
+++ b/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
diff --git a/nova/scheduler/scheduler_options.py b/nova/scheduler/scheduler_options.py
index e8be0070b..5c253bc4f 100644
--- a/nova/scheduler/scheduler_options.py
+++ b/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