summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-07-09 13:50:05 -0400
committerScott Moser <smoser@ubuntu.com>2012-07-09 13:50:05 -0400
commit972c4e0d1bcfe40414dfb08525eb0fc35cec102e (patch)
tree75b3fc822c57354932df312f235460655e2fea3e /config
parentf1b72be4b4923d3effb80e1898f76ba0f81aab23 (diff)
downloadvyos-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 'config')
-rw-r--r--config/cloud.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/cloud.cfg b/config/cloud.cfg
index 5dae4047..cb51d061 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -70,5 +70,5 @@ system_info:
templates_dir: /etc/cloud/templates/
upstart_dir: /etc/init/
package_mirror: http://archive.ubuntu.com/ubuntu
- availability_zone_template: http://%(zone)s.ec2.archive.ubuntu.com/ubuntu/
+ package_mirror_ec2_template: http://%(region)s.ec2.archive.ubuntu.com/ubuntu/
ssh_svcname: ssh