From 06b95e349cf3e6bc5d45b7030683d53eeae490ec Mon Sep 17 00:00:00 2001 From: wutianwei Date: Wed, 28 Jun 2017 14:19:02 +0800 Subject: Change the apt source 1. change the apt sorce from http://hk.archive.ubuntu.com to http://archive.ubuntu.com 2. if setup host failed, destroy the failed lxc. then retry to setup. 3. fix the dns-nameserver bug Change-Id: Ic609c75b50496e2174ab09425bce45a0ec2c09c0 Signed-off-by: wutianwei Signed-off-by: chigang --- .../roles/pre-prepare/templates/sources.list | 60 ++++++++-------------- 1 file changed, 20 insertions(+), 40 deletions(-) (limited to 'deploy/adapters/ansible/roles/pre-prepare/templates/sources.list') diff --git a/deploy/adapters/ansible/roles/pre-prepare/templates/sources.list b/deploy/adapters/ansible/roles/pre-prepare/templates/sources.list index 1c3ab410..799e4b58 100644 --- a/deploy/adapters/ansible/roles/pre-prepare/templates/sources.list +++ b/deploy/adapters/ansible/roles/pre-prepare/templates/sources.list @@ -1,56 +1,36 @@ -# - -# deb cdrom:[Ubuntu-Server 16.04.1 LTS _Xenial Xerus_ - Release amd64 (20160719)]/ xenial main restricted - -#deb cdrom:[Ubuntu-Server 16.04.1 LTS _Xenial Xerus_ - Release amd64 (20160719)]/ xenial main restricted - # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to # newer versions of the distribution. -deb http://hk.archive.ubuntu.com/ubuntu/ xenial main restricted -# deb-src http://hk.archive.ubuntu.com/ubuntu/ xenial main restricted + +deb http://archive.ubuntu.com/ubuntu/ xenial main restricted +deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted ## Major bug fix updates produced after the final release of the ## distribution. -deb http://hk.archive.ubuntu.com/ubuntu/ xenial-updates main restricted -# deb-src http://hk.archive.ubuntu.com/ubuntu/ xenial-updates main restricted +deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted +deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted +## Uncomment the following two lines to add software from the 'universe' +## repository. ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## team. Also, please note that software in universe WILL NOT receive any ## review or updates from the Ubuntu security team. -deb http://hk.archive.ubuntu.com/ubuntu/ xenial universe -# deb-src http://hk.archive.ubuntu.com/ubuntu/ xenial universe -deb http://hk.archive.ubuntu.com/ubuntu/ xenial-updates universe -# deb-src http://hk.archive.ubuntu.com/ubuntu/ xenial-updates universe - -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team, and may not be under a free licence. Please satisfy yourself as to -## your rights to use the software. Also, please note that software in -## multiverse WILL NOT receive any review or updates from the Ubuntu -## security team. -deb http://hk.archive.ubuntu.com/ubuntu/ xenial multiverse -# deb-src http://hk.archive.ubuntu.com/ubuntu/ xenial multiverse -deb http://hk.archive.ubuntu.com/ubuntu/ xenial-updates multiverse -# deb-src http://hk.archive.ubuntu.com/ubuntu/ xenial-updates multiverse +deb http://archive.ubuntu.com/ubuntu/ xenial universe +deb-src http://archive.ubuntu.com/ubuntu/ xenial universe +deb http://archive.ubuntu.com/ubuntu/ xenial-updates universe +deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates universe ## N.B. software from this repository may not have been tested as ## extensively as that contained in the main release, although it includes ## newer versions of some applications which may provide useful features. ## Also, please note that software in backports WILL NOT receive any review ## or updates from the Ubuntu security team. -deb http://hk.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse -# deb-src http://hk.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse - -## Uncomment the following two lines to add software from Canonical's -## 'partner' repository. -## This software is not part of Ubuntu, but is offered by Canonical and the -## respective vendors as a service to Ubuntu users. -# deb http://archive.canonical.com/ubuntu xenial partner -# deb-src http://archive.canonical.com/ubuntu xenial partner - -deb http://security.ubuntu.com/ubuntu xenial-security main restricted -# deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted -deb http://security.ubuntu.com/ubuntu xenial-security universe -# deb-src http://security.ubuntu.com/ubuntu xenial-security universe -deb http://security.ubuntu.com/ubuntu xenial-security multiverse -# deb-src http://security.ubuntu.com/ubuntu xenial-security multiverse +# deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted +# deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted + +deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted +deb-src http://archive.ubuntu.com/ubuntu/ xenial-security main restricted +deb http://archive.ubuntu.com/ubuntu/ xenial-security universe +deb-src http://archive.ubuntu.com/ubuntu/ xenial-security universe +# deb http://archive.ubuntu.com/ubuntu/ xenial-security multiverse +# deb-src http://archive.ubuntu.com/ubuntu/ xenial-security multiverse -- cgit 1.2.3-korg