summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorThierry Carrez <thierry@openstack.org>2011-06-17 20:47:23 +0000
committerTarmac <>2011-06-17 20:47:23 +0000
commita854d4e17214269b729777967e028600fdf4ee50 (patch)
tree83c1a750b1f271b068a5fa1aa970c9929a078970 /nova/api
parent2e6c26fcc8967192e35e0d2b2473bae578eb5b04 (diff)
parenta0ab4e7f141ccf14caca23f15eed5408079a58d0 (diff)
downloadnova-a854d4e17214269b729777967e028600fdf4ee50.tar.gz
nova-a854d4e17214269b729777967e028600fdf4ee50.tar.xz
nova-a854d4e17214269b729777967e028600fdf4ee50.zip
Make EC2 update_instance() only update updatable_fields, rather than all
fields. Patch courtesy of Vladimir Popovski.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index e1c65ae40..c8a7e69be 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -974,7 +974,8 @@ class CloudController(object):
changes[field] = kwargs[field]
if changes:
instance_id = ec2utils.ec2_id_to_id(instance_id)
- self.compute_api.update(context, instance_id=instance_id, **kwargs)
+ self.compute_api.update(context, instance_id=instance_id,
+ **changes)
return True
@staticmethod