summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-08 15:23:18 +0000
committerGerrit Code Review <review@openstack.org>2012-08-08 15:23:18 +0000
commit22526fe42acadee2129a0ab9940e0795490c51ed (patch)
treee23fd3e50556168e75294b5cb7736fffa133d1aa
parent39b7e7ea43448cec4f8cf78a514d06a381ceb432 (diff)
parent906bf3a115321e0fdf5b0b97a09a7c7b832486eb (diff)
Merge "Fix a bug on db.instance_get_by_uuid in compute/manager.py"
-rw-r--r--nova/compute/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 2f9d6066e..5ce92e548 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1334,7 +1334,7 @@ class ComputeManager(manager.SchedulerDependentManager):
instance_uuid=None):
"""Update the metadata published to the instance."""
if not instance:
- instance = self.db.instance_get_by_uuid(context, instance)
+ instance = self.db.instance_get_by_uuid(context, instance_uuid)
LOG.debug(_("Changing instance metadata according to %(diff)r") %
locals(), instance=instance)
self.driver.change_instance_metadata(context, instance, diff)