diff options
| author |   wutianwei <wutianwei1@huawei.com> | 2017-07-04 17:46:39 +0800 |
|---|---|---|
| committer | wutianwei <wutianwei1@huawei.com> | 2017-07-06 11:08:59 +0800 |
| commit | 191324087c0fc0524f8566de8eeec3e35e34dcca (patch) | |
| tree | ffda15665058f3a691d41d176c977aef30b3076e /deploy/adapters/ansible/roles/pre-openstack | |
| parent | f88debf12abbf678ad533c17997c535f63bc3799 (diff) | |
fetch openrc for functest
We use openstack-ansible to deploy the openstack,
the position of openrc is different from the before.
change the apt source when use local apt repository
Change-Id: I1c5492b294a8645f452868c9cf2fec2e0802f823
Signed-off-by: wutianwei <wutianwei1@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/pre-openstack')
| -rw-r--r-- | deploy/adapters/ansible/roles/pre-openstack/tasks/Ubuntu.yml | 5 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/pre-openstack/templates/sources.list | 36 |
2 files changed, 0 insertions, 41 deletions
diff --git a/deploy/adapters/ansible/roles/pre-openstack/tasks/Ubuntu.yml b/deploy/adapters/ansible/roles/pre-openstack/tasks/Ubuntu.yml index a0f7d015..5bb77485 100644 --- a/deploy/adapters/ansible/roles/pre-openstack/tasks/Ubuntu.yml +++ b/deploy/adapters/ansible/roles/pre-openstack/tasks/Ubuntu.yml @@ -49,11 +49,6 @@ - /tmp/ssh-keys-* - /root/.ssh/id_rsa.pub -- name: change sourcesi(apt) list - template: - src: sources.list - dest: /etc/apt/sources.list - - name: rm apt.conf file: path: /etc/apt/apt.conf diff --git a/deploy/adapters/ansible/roles/pre-openstack/templates/sources.list b/deploy/adapters/ansible/roles/pre-openstack/templates/sources.list deleted file mode 100644 index 799e4b58..00000000 --- a/deploy/adapters/ansible/roles/pre-openstack/templates/sources.list +++ /dev/null @@ -1,36 +0,0 @@ -# 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 - |