summaryrefslogtreecommitdiff
path: root/cloudinit/config
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-08-03 14:34:29 -0400
committerScott Moser <smoser@ubuntu.com>2012-08-03 14:34:29 -0400
commit903b0867c43819dfa04f33db3b3ecb68e906e594 (patch)
tree93796937303286ea339d487e6d3785b9b9414c8d /cloudinit/config
parent659bb077d147ab8cd8fbf6b2825bcd4051b304a9 (diff)
downloadvyos-cloud-init-903b0867c43819dfa04f33db3b3ecb68e906e594.tar.gz
vyos-cloud-init-903b0867c43819dfa04f33db3b3ecb68e906e594.zip
do not search for mirror named '<distro>-mirror' in dns by default
As described in the bug, enough non-cloud users experienced issues with cloud-init selecting a mirror due to consumer level network providers using dns server redirection. We're turning this off by default. LP: #974509
Diffstat (limited to 'cloudinit/config')
-rw-r--r--cloudinit/config/cc_apt_update_upgrade.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/config/cc_apt_update_upgrade.py b/cloudinit/config/cc_apt_update_upgrade.py
index 5c5e510c..76ecfb42 100644
--- a/cloudinit/config/cc_apt_update_upgrade.py
+++ b/cloudinit/config/cc_apt_update_upgrade.py
@@ -255,7 +255,7 @@ def find_apt_mirror(cloud, cfg):
if mydom:
doms.append(".%s" % mydom)
- if not mirror:
+ if not mirror and cfg.get(cfg, "apt_mirror_search_dns", False):
doms.extend((".localdomain", "",))
mirror_list = []