summaryrefslogtreecommitdiffstats
path: root/nova/volume
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-11-15 19:41:58 -0500
committerMark McLoughlin <markmc@redhat.com>2012-11-17 16:30:03 +0000
commit6e92a67fc3e6dcd587e3fd225b7142bc74116e52 (patch)
tree0c25405e1b7bd383c3801244645be8b76b408e40 /nova/volume
parent0e932e6b2390ee8731134cfdb1dcdea3adfc8062 (diff)
Remove nova.flags
Now that options have all moved from nova.flags to nova.config, we can safely remove the nova.flags imports and replace them with nova.config imports. Change-Id: Ic077a72dd6419bbf1e1babe71acfa43c4e8b55c8
Diffstat (limited to 'nova/volume')
-rw-r--r--nova/volume/__init__.py1
-rw-r--r--nova/volume/cinder.py1
2 files changed, 0 insertions, 2 deletions
diff --git a/nova/volume/__init__.py b/nova/volume/__init__.py
index 1eedd199d..cc7dcf4d9 100644
--- a/nova/volume/__init__.py
+++ b/nova/volume/__init__.py
@@ -19,7 +19,6 @@
# Importing full names to not pollute the namespace and cause possible
# collisions with use of 'from nova.volume import <foo>' elsewhere.
import nova.config
-import nova.flags
import nova.openstack.common.importutils
diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py
index 45a2b1693..67e303e01 100644
--- a/nova/volume/cinder.py
+++ b/nova/volume/cinder.py
@@ -27,7 +27,6 @@ from cinderclient.v1 import client as cinder_client
from nova import config
from nova.db import base
from nova import exception
-from nova import flags
from nova.openstack.common import cfg
from nova.openstack.common import log as logging