summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-01-05 19:52:55 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2011-01-05 19:52:55 +0000
commit3d30bb1706812c4e6f9c1e01b373bb076a9f7ee3 (patch)
tree89241c6e2dff41e3b738e82a10d9766cbf8a525a
parentf1f292a787ba20134c007da087bd9585d1875e86 (diff)
downloadnova-3d30bb1706812c4e6f9c1e01b373bb076a9f7ee3.tar.gz
nova-3d30bb1706812c4e6f9c1e01b373bb076a9f7ee3.tar.xz
nova-3d30bb1706812c4e6f9c1e01b373bb076a9f7ee3.zip
pep8 cleanup
-rw-r--r--nova/compute/disk.py1
-rw-r--r--nova/virt/libvirt_conn.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/disk.py b/nova/compute/disk.py
index ac0d689d5..bbcd55678 100644
--- a/nova/compute/disk.py
+++ b/nova/compute/disk.py
@@ -199,6 +199,7 @@ def _unlink_device(device, nbd):
_DEVICES = ['/dev/nbd%s' % i for i in xrange(16)]
+
def _allocate_device():
# NOTE(vish): This assumes no other processes are using nbd devices.
# It will race cause a race condition if multiple
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 95a374603..77ff281d5 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -154,6 +154,7 @@ def wrap_image_cache(key):
return _wrap
return _decorator
+
class LibvirtConnection(object):
def __init__(self, read_only):
@@ -512,7 +513,6 @@ class LibvirtConnection(object):
user=user,
project=project)
-
size = FLAGS.minimum_root_size
if not FLAGS.use_cow_images:
if inst['instance_type'] == 'm1.tiny' or prefix == 'rescue-':