From 249279cd7c70a7306ed28a62939477ef94ecbc91 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 9 Jun 2011 15:31:10 -0400
Subject: further changes

---
 nova/api/openstack/notes.txt         | 3 ---
 nova/flags.py                        | 2 +-
 nova/virt/vmwareapi/vmware_images.py | 6 ------
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/nova/api/openstack/notes.txt b/nova/api/openstack/notes.txt
index 2330f1002..4e95bffc8 100644
--- a/nova/api/openstack/notes.txt
+++ b/nova/api/openstack/notes.txt
@@ -7,9 +7,6 @@ image ids.
 GlanceImageService(ImageService):
 image ids are URIs.
 
-LocalImageService(ImageService):
-image ids are random strings.
-
 OpenstackAPITranslationStore:
 translates RS server/images/flavor/etc ids into formats required
 by a given ImageService strategy.
diff --git a/nova/flags.py b/nova/flags.py
index d5090edba..ebdfeb7ae 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -362,7 +362,7 @@ DEFINE_string('scheduler_manager', 'nova.scheduler.manager.SchedulerManager',
               'Manager for scheduler')
 
 # The service to use for image search and retrieval
-DEFINE_string('image_service', 'nova.image.local.LocalImageService',
+DEFINE_string('image_service', 'nova.image.glance.GlanceImageService',
               'The service to use for retrieving and searching for images.')
 
 DEFINE_string('host', socket.gethostname(),
diff --git a/nova/virt/vmwareapi/vmware_images.py b/nova/virt/vmwareapi/vmware_images.py
index 48edc5384..70adba74f 100644
--- a/nova/virt/vmwareapi/vmware_images.py
+++ b/nova/virt/vmwareapi/vmware_images.py
@@ -90,8 +90,6 @@ def fetch_image(image, instance, **kwargs):
         func = _get_glance_image
     elif FLAGS.image_service == "nova.image.s3.S3ImageService":
         func = _get_s3_image
-    elif FLAGS.image_service == "nova.image.local.LocalImageService":
-        func = _get_local_image
     else:
         raise NotImplementedError(_("The Image Service %s is not implemented")
                                   % FLAGS.image_service)
@@ -105,8 +103,6 @@ def upload_image(image, instance, **kwargs):
         func = _put_glance_image
     elif FLAGS.image_service == "nova.image.s3.S3ImageService":
         func = _put_s3_image
-    elif FLAGS.image_service == "nova.image.local.LocalImageService":
-        func = _put_local_image
     else:
         raise NotImplementedError(_("The Image Service %s is not implemented")
                                   % FLAGS.image_service)
@@ -192,8 +188,6 @@ def get_vmdk_size_and_properties(image, instance):
         size, properties = meta_data["size"], meta_data["properties"]
     elif FLAGS.image_service == "nova.image.s3.S3ImageService":
         raise NotImplementedError
-    elif FLAGS.image_service == "nova.image.local.LocalImageService":
-        raise NotImplementedError
     LOG.debug(_("Got image size of %(size)s for the image %(image)s") %
               locals())
     return size, properties
-- 
cgit