diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-10-11 16:01:15 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-10-11 16:01:15 +0000 |
| commit | ed5d6ca32e2996e8218a5e6d70b9952619ef6564 (patch) | |
| tree | e09c843b5263617eb0b98cd51d32c1cf05c63c7a /nova/api | |
| parent | 414a3dee16252e2559856b92ab7ed7b1d9d60778 (diff) | |
| parent | 76a76244ccee2502903a67f3f17dda97664e6687 (diff) | |
Rename ec2_id_list back to instance_id to conform to EC2 argument spec
Diffstat (limited to 'nova/api')
| -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 11e54d2b5..619c1a4b0 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) |