summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-01-03 19:32:25 -0800
committerSandy Walsh <sandy.walsh@rackspace.com>2011-01-03 19:32:25 -0800
commit75618ce6379cb01b9f78ddb7c2f26501b838ca71 (patch)
treed86d11e30d3a49dfe7a05bb520daba09036a6108 /nova/api
parent09b1844c012504e5b14d05e6178e35dfeb0c6579 (diff)
downloadnova-75618ce6379cb01b9f78ddb7c2f26501b838ca71.tar.gz
nova-75618ce6379cb01b9f78ddb7c2f26501b838ca71.tar.xz
nova-75618ce6379cb01b9f78ddb7c2f26501b838ca71.zip
dabo fix to update for password reset v2
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 35c3324ab..a5de62230 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -176,9 +176,9 @@ class Controller(wsgi.Controller):
try:
ctxt = req.environ['nova.context']
- self.compute_api.update_instance(ctxt,
- id,
- **update_dict)
+ # The ID passed in is actually the internal_id of the
+ # instance, not the value of the id column in the DB.
+ self.compute_api.update_instance(ctxt, instance.id, **update_dict)
except exception.NotFound:
return faults.Fault(exc.HTTPNotFound())
return exc.HTTPNoContent()