diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-28 11:54:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-28 11:54:50 +0000 |
| commit | 33ab99a1af28f731eb75b32d93c772fedb8ca2b0 (patch) | |
| tree | aaa4a9ac121cad3ad0c70706749d5ae44994c307 | |
| parent | f8343bb3c2592404197c0d56fc987fd8b779a307 (diff) | |
| parent | f2d0d2926961a0758c071ae6e4743260a837b7c4 (diff) | |
| download | nova-33ab99a1af28f731eb75b32d93c772fedb8ca2b0.tar.gz nova-33ab99a1af28f731eb75b32d93c772fedb8ca2b0.tar.xz nova-33ab99a1af28f731eb75b32d93c772fedb8ca2b0.zip | |
Merge "Fix timeout in EC2 CloudController.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 012afb9be..f64bc9492 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1601,7 +1601,7 @@ class CloudController(object): # NOTE(yamahata): timeout and error. 1 hour for now for safety. # Is it too short/long? # Or is there any better way? - timeout = 1 * 60 * 60 * 60 + timeout = 1 * 60 * 60 if time.time() > start_time + timeout: raise exception.EC2APIError( _('Couldn\'t stop instance with in %d sec') % timeout) |