summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-01-11 13:54:23 -0600
committerRick Harris <rick.harris@rackspace.com>2011-01-11 13:54:23 -0600
commit69a2612be4e865063fa5982462673f1843e8befc (patch)
treeafb4ccc62845dd0bd9334aa09f3bbb258eb3c805
parent0528a70562afcdb56bbc83359c1443459a6684ba (diff)
Changes per Edays comments
-rw-r--r--nova/api/openstack/images.py2
-rw-r--r--nova/compute/api.py4
2 files changed, 2 insertions, 4 deletions
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 1102098b8..8f3f94ea1 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -138,7 +138,7 @@ class Controller(wsgi.Controller):
instance_id = env["image"]["serverId"]
name = env["image"]["name"]
- image_meta = compute_api.ComputeAPI().snapshot(
+ image_meta = compute.ComputeAPI().snapshot(
context, instance_id, name)
return dict(image=image_meta)
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 7e30d45d6..c02550419 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -333,10 +333,8 @@ class API(base.Base):
instance = self.get(context, instance_id)
host = instance['host']
- image_service = utils.import_object(FLAGS.image_service)
-
data = {'name': name, 'is_public': True}
- image_meta = image_service.create(context, data)
+ image_meta = self.image_service.create(context, data)
rpc.cast(context,
self.db.queue_get_for(context, FLAGS.compute_topic, host),
{"method": "snapshot_instance",