diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-23 14:46:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-23 14:46:58 +0000 |
| commit | 3e13afa8ecfb8f6b30ea247098095c079cacfd3b (patch) | |
| tree | 58d7158fda027865eb568eecbea982bda9253fdb /nova/api | |
| parent | 4a251921c8dd24b3fe2dd30501d744804af00582 (diff) | |
| parent | 9250a5d8c18311005329ec622482d1c2a29de307 (diff) | |
| download | nova-3e13afa8ecfb8f6b30ea247098095c079cacfd3b.tar.gz nova-3e13afa8ecfb8f6b30ea247098095c079cacfd3b.tar.xz nova-3e13afa8ecfb8f6b30ea247098095c079cacfd3b.zip | |
Merge "Fix EC2 CreateImage no_reboot logic"
Diffstat (limited to 'nova/api')
| -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 e0fb434d0..8a9f5f158 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1578,7 +1578,7 @@ class CloudController(object): ec2_id = ec2utils.glance_id_to_ec2_id(context, new_image['id']) if restart_instance: - self.compute_api.start(context, instance_id=instance_id) + self.compute_api.start(context, instance) return {'imageId': ec2_id} |
