diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-09 22:08:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-09 22:08:01 +0000 |
| commit | 01a1f68ca891c2002d6833020fca9d451c303a39 (patch) | |
| tree | 2092d7d89da5631418cb20674c909d9350e876b4 /nova/api | |
| parent | 65c3759674dec87c895c44d95c7b279ea4e4eb05 (diff) | |
| parent | 0fa3f0e6da4e8f1d5d09e6797bb5eae806ece400 (diff) | |
| download | nova-01a1f68ca891c2002d6833020fca9d451c303a39.tar.gz nova-01a1f68ca891c2002d6833020fca9d451c303a39.tar.xz nova-01a1f68ca891c2002d6833020fca9d451c303a39.zip | |
Merge "Make TerminateInstances compatible with EC2 api"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 42ba1e8e5..80f3a5012 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -921,10 +921,10 @@ class CloudController(object): try: internal_id = ec2utils.ec2_id_to_id(ec2_id) instance = self.compute_api.get(context, internal_id) - i['shutdownState'] = _state_description(instance['vm_state'], + i['currentState'] = _state_description(instance['vm_state'], instance['shutdown_terminate']) except exception.NotFound: - i['shutdownState'] = _state_description(vm_states.DELETED, + i['currentState'] = _state_description(vm_states.DELETED, True) instances_set.append(i) return {'instancesSet': instances_set} |