summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChiradeep Vittal <chiradeep@chiradeep-lt2>2010-10-13 00:06:29 -0700
committerChiradeep Vittal <chiradeep@chiradeep-lt2>2010-10-13 00:06:29 -0700
commitb28c43c1f66cc111e34e9bbc45a78ff7aa60fd29 (patch)
treec07f7fe405c3c2704309d1acb143aec3eadb6253
parent01ad0a05c4f93bb5e95a1c781d492374739dce2c (diff)
downloadnova-b28c43c1f66cc111e34e9bbc45a78ff7aa60fd29.tar.gz
nova-b28c43c1f66cc111e34e9bbc45a78ff7aa60fd29.tar.xz
nova-b28c43c1f66cc111e34e9bbc45a78ff7aa60fd29.zip
Newlines again, reorder imports
-rw-r--r--nova/virt/images.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/nova/virt/images.py b/nova/virt/images.py
index 75e6f783e..a68d856a1 100644
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
@@ -21,20 +21,20 @@
Handling of VM disk images.
"""
+import logging
+import os
import os.path
+import shutil
+import sys
import time
+import urllib2
import urlparse
-import shutil
from nova import flags
from nova import process
from nova.auth import manager
from nova.auth import signer
-import logging
-import urllib2
-import os
-import sys
FLAGS = flags.FLAGS
flags.DEFINE_bool('use_s3', True,
@@ -48,6 +48,7 @@ def fetch(image, path, user, project):
f = _fetch_local_image
return f(image, path, user, project)
+
def _fetch_image_no_curl(url, path, headers):
request = urllib2.Request(url)
for (k, v) in headers.iteritems():
@@ -103,6 +104,7 @@ def _fetch_local_image(image, path, user, project):
def _image_path(path):
return os.path.join(FLAGS.images_path, path)
+
def image_url(image):
return "http://%s:%s/_images/%s/image" % (FLAGS.s3_host, FLAGS.s3_port,
image)