diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2017-11-23 08:52:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-23 08:52:43 +0000 |
| commit | 9a76ddb1075479c891389a0c9303d80ead9895a0 (patch) | |
| tree | 710319df4afdbd566ac7bd3b3a9e3924ca295053 /deploy/adapters/ansible/kubernetes/roles/pre-k8s | |
| parent | abf896027b53f98f6f61a6c225aa3cde636f5877 (diff) | |
| parent | a9f6a2b1665a31bbdaf266c333410bde2418cf15 (diff) | |
Merge "Support the scenario for installing kubernetes in ubuntu system"
Diffstat (limited to 'deploy/adapters/ansible/kubernetes/roles/pre-k8s')
| -rw-r--r-- | deploy/adapters/ansible/kubernetes/roles/pre-k8s/files/sources.list.official | 36 | ||||
| -rw-r--r-- | deploy/adapters/ansible/kubernetes/roles/pre-k8s/tasks/Ubuntu.yml | 16 |
2 files changed, 52 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/kubernetes/roles/pre-k8s/files/sources.list.official b/deploy/adapters/ansible/kubernetes/roles/pre-k8s/files/sources.list.official new file mode 100644 index 00000000..799e4b58 --- /dev/null +++ b/deploy/adapters/ansible/kubernetes/roles/pre-k8s/files/sources.list.official @@ -0,0 +1,36 @@ +# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to +# newer versions of the distribution. + +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://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://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://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 + diff --git a/deploy/adapters/ansible/kubernetes/roles/pre-k8s/tasks/Ubuntu.yml b/deploy/adapters/ansible/kubernetes/roles/pre-k8s/tasks/Ubuntu.yml index 5bb77485..8054267d 100644 --- a/deploy/adapters/ansible/kubernetes/roles/pre-k8s/tasks/Ubuntu.yml +++ b/deploy/adapters/ansible/kubernetes/roles/pre-k8s/tasks/Ubuntu.yml @@ -54,6 +54,22 @@ path: /etc/apt/apt.conf state: absent +- name: rm sources.list + file: + path: /etc/apt/sources.list + state: absent + +- name: remove the space end of the line in the resolv.conf + shell: "sed -i 's/ *$//' /etc/resolv.conf" + +- name: change sources list + copy: + src: sources.list.official + dest: /etc/apt/sources.list + +- name: update apt cache + apt: update_cache=yes + - name: restart ntp service shell: "service ntp restart" |