From a1c28495aa8d970df0c1afa4efac1d10bdb24825 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Thu, 2 Feb 2012 10:07:50 +0000 Subject: various cleanups No functional changes Change-Id: I19e118e6e0c47fccfe5a817e727f3ab27e26aa79 --- nova/virt/images.py | 1 - nova/virt/libvirt/imagecache.py | 2 -- nova/virt/libvirt/utils.py | 6 +++--- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'nova/virt') diff --git a/nova/virt/images.py b/nova/virt/images.py index 12510c792..1e0ae0a22 100644 --- a/nova/virt/images.py +++ b/nova/virt/images.py @@ -32,7 +32,6 @@ from nova.openstack.common import cfg from nova import utils -FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) image_opts = [ diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py index 8b01c27c5..25455a07c 100644 --- a/nova/virt/libvirt/imagecache.py +++ b/nova/virt/libvirt/imagecache.py @@ -23,11 +23,9 @@ http://wiki.openstack.org/nova-image-cache-management. """ -import datetime import hashlib import os import re -import sys import time from nova import compute diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py index 0eec1db1a..db7e11b26 100644 --- a/nova/virt/libvirt/utils.py +++ b/nova/virt/libvirt/utils.py @@ -53,9 +53,9 @@ def create_image(disk_format, path, size): :param size: Desired size of disk image. May be given as an int or a string. If given as an int, it will be interpreted as bytes. If it's a string, it should consist of a number - followed by an optional prefix ('k' for kilobytes, 'm' - for megabytes, 'g' for gigabytes, 't' for terabytes). If no - prefix is given, it will be interpreted as bytes. + with an optional suffix ('K' for Kibibytes, + M for Mebibytes, 'G' for Gibibytes, 'T' for Tebibytes). + If no suffix is given, it will be interpreted as bytes. """ execute('qemu-img', 'create', '-f', disk_format, path, size) -- cgit