summaryrefslogtreecommitdiffstats
path: root/nova/image
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/image
parent0e932e6b2390ee8731134cfdb1dcdea3adfc8062 (diff)
downloadnova-6e92a67fc3e6dcd587e3fd225b7142bc74116e52.tar.gz
nova-6e92a67fc3e6dcd587e3fd225b7142bc74116e52.tar.xz
nova-6e92a67fc3e6dcd587e3fd225b7142bc74116e52.zip
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/image')
-rw-r--r--nova/image/glance.py1
-rw-r--r--nova/image/s3.py1
2 files changed, 0 insertions, 2 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py
index 0cbc91531..6e0a57773 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -31,7 +31,6 @@ import glanceclient.exc
from nova import config
from nova import exception
-from nova import flags
from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging
from nova.openstack.common import timeutils
diff --git a/nova/image/s3.py b/nova/image/s3.py
index d252baba0..e6ab8bb15 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -33,7 +33,6 @@ from nova.api.ec2 import ec2utils
import nova.cert.rpcapi
from nova import config
from nova import exception
-from nova import flags
from nova.image import glance
from nova.openstack.common import cfg
from nova.openstack.common import log as logging