summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaypipes@gmail.com <>2010-10-05 16:19:55 -0400
committerjaypipes@gmail.com <>2010-10-05 16:19:55 -0400
commitfbd1bc015bd5615963b9073eefb895ea04c55a3e (patch)
treeef47434f1e0b62452fa8847b6f605fc6bfc145eb
parent17a0602726cf916bf01c3f9ecf9c328d1fb1ee82 (diff)
downloadnova-fbd1bc015bd5615963b9073eefb895ea04c55a3e.tar.gz
nova-fbd1bc015bd5615963b9073eefb895ea04c55a3e.tar.xz
nova-fbd1bc015bd5615963b9073eefb895ea04c55a3e.zip
Merge overwrote import_object() load of image service.
-rw-r--r--nova/api/rackspace/servers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/rackspace/servers.py b/nova/api/rackspace/servers.py
index 5cfb7a431..b23867bbf 100644
--- a/nova/api/rackspace/servers.py
+++ b/nova/api/rackspace/servers.py
@@ -42,7 +42,7 @@ def _instance_id_translator():
def _image_service():
""" Helper method for initializing the image id translator """
- service = nova.image.service.ImageService.load()
+ service = utils.import_object(FLAGS.image_service)
return (service, _id_translator.RackspaceAPIIdTranslator(
"image", service.__class__.__name__))