diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-10-11 11:21:26 -0400 |
|---|---|---|
| committer | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-10-11 11:21:26 -0400 |
| commit | 76a76244ccee2502903a67f3f17dda97664e6687 (patch) | |
| tree | 4c12764a6bd8fe9843a63987112d897c469ff909 | |
| parent | 05e129b0d3e019efb5490266e05b9e157e0a50de (diff) | |
| download | nova-76a76244ccee2502903a67f3f17dda97664e6687.tar.gz nova-76a76244ccee2502903a67f3f17dda97664e6687.tar.xz nova-76a76244ccee2502903a67f3f17dda97664e6687.zip | |
Fix bug 658444
| -rw-r--r-- | nova/api/ec2/cloud.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 175bb493c..ca0f64e99 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -659,7 +659,12 @@ class CloudController(object): return self._format_run_instances(context, reservation_id) - def terminate_instances(self, context, ec2_id_list, **kwargs): + def terminate_instances(self, context, instance_id, **kwargs): + """Terminate each instance in instance_id, which is a list of ec2 ids. + + instance_id is a kwarg so its name cannot be modified. + """ + ec2_id_list = instance_id logging.debug("Going to start terminating instances") for id_str in ec2_id_list: internal_id = ec2_id_to_internal_id(id_str) |