From 972c4e0d1bcfe40414dfb08525eb0fc35cec102e Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 9 Jul 2012 13:50:05 -0400 Subject: 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. --- config/cloud.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') 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 -- cgit v1.2.3