diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-07-09 13:50:05 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-07-09 13:50:05 -0400 |
| commit | 972c4e0d1bcfe40414dfb08525eb0fc35cec102e (patch) | |
| tree | 75b3fc822c57354932df312f235460655e2fea3e /cloudinit/util.py | |
| parent | f1b72be4b4923d3effb80e1898f76ba0f81aab23 (diff) | |
| download | vyos-cloud-init-972c4e0d1bcfe40414dfb08525eb0fc35cec102e.tar.gz vyos-cloud-init-972c4e0d1bcfe40414dfb08525eb0fc35cec102e.zip | |
DataSourceEc2: only do dns check in mirror selection
This returns the check for an archive mirror in the DataSourceEc2 to
only do so by DNS resolution. The 'rework' branch had made the check
wait and timeout on attempts to reach the mirror. This resulted
in 120 seconds of waiting before failure.
For now, just go back to the old situation of checking by dns.
Diffstat (limited to 'cloudinit/util.py')
| -rw-r--r-- | cloudinit/util.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index d7dd20b5..d0d7a303 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -805,7 +805,10 @@ def is_resolvable_url(url): def search_for_mirror(candidates): - """ Search through a list of mirror urls for one that works """ + """ + Search through a list of mirror urls for one that works + This needs to return quickly. + """ for cand in candidates: try: if is_resolvable_url(cand): |