diff options
| -rw-r--r-- | nova/compute/disk.py | 1 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 2 |
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-': |