diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-07-19 23:17:27 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-07-19 23:17:27 -0400 |
| commit | be623b70dbc7c591f14baa9314105e78bbe0f63f (patch) | |
| tree | a77e2fb8fd8e8216490fee36fd9d6924a6559e2d /ChangeLog | |
| parent | 6d25c040ee566f6ef85352d7b52eb5947230f78a (diff) | |
| download | vyos-cloud-init-be623b70dbc7c591f14baa9314105e78bbe0f63f.tar.gz vyos-cloud-init-be623b70dbc7c591f14baa9314105e78bbe0f63f.zip | |
increase timeout on read_seed when a seedfrom was explicitly given
In the case where a seedfrom value was given on the command line or in the
config file, we were timing out in 2 seconds on the connection. That timeout
was put in place to support "probing" for sources, but seedfrom is explictly
given.
So, in that case, do a urllib.open without a timeout value. Looking at source
code, default timeout is 'socket._GLOBAL_DEFAULT_TIMEOUT', but rather than
importing that and using it, I will call without a timeout value.
LP: #812646
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -27,6 +27,7 @@ - sanitize hosts file for system's hostname to 127.0.1.1 (LP: #802637) - add chef support (cloudinit/CloudConfig/cc_chef.py) - do not give trace on failure to resize in lxc container (LP: #800856) + - increase the timeout on url gets for "seedfrom" values (LP: #812646) 0.6.1: - fix bug in fixing permission on /var/log/cloud-init.log (LP: #704509) - improve comment strings in rsyslog file tools/21-cloudinit.conf |