diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-24 01:42:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-24 01:42:46 +0000 |
| commit | 8924ad8d6d57810d4de6ce4ce61efdccc759b066 (patch) | |
| tree | 635175dbff9da80de47455c75829e613b6fa112d | |
| parent | 7c4e31e639c0a96778fb7a158f6e5106bc3f2abb (diff) | |
| parent | d7d94ac975743585675978890bc8e737db627b9d (diff) | |
| download | nova-8924ad8d6d57810d4de6ce4ce61efdccc759b066.tar.gz nova-8924ad8d6d57810d4de6ce4ce61efdccc759b066.tar.xz nova-8924ad8d6d57810d4de6ce4ce61efdccc759b066.zip | |
Merge "Fix instance stop in EC2 create_image"
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 3d5e74e7c..352ba02a5 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1531,7 +1531,7 @@ class CloudController(object): if vm_state in (vm_states.ACTIVE, vm_states.SHUTOFF): restart_instance = True - self.compute_api.stop(context, instance_id=instance_id) + self.compute_api.stop(context, instance) # wait instance for really stopped start_time = time.time() |