From 191324087c0fc0524f8566de8eeec3e35e34dcca Mon Sep 17 00:00:00 2001 From: wutianwei Date: Tue, 4 Jul 2017 17:46:39 +0800 Subject: 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 --- .../ansible/roles/config-compute/tasks/Ubuntu.yml | 18 +++++++++++ .../config-compute/templates/sources.list.lab | 7 +++++ .../config-compute/templates/sources.list.official | 36 ++++++++++++++++++++++ .../ansible/roles/config-compute/vars/main.yml | 10 ++++++ .../roles/config-controller/tasks/Ubuntu.yml | 17 ++++++++++ .../config-controller/templates/sources.list.lab | 7 +++++ .../templates/sources.list.official | 36 ++++++++++++++++++++++ .../ansible/roles/config-controller/vars/main.yml | 10 ++++++ .../roles/config-osa/files/fetch-openrc.yml | 18 +++++++++++ .../ansible/roles/config-osa/files/http.yml | 8 +++++ .../ansible/roles/config-osa/files/setup-ovs.yml | 8 +++++ .../ansible/roles/config-osa/tasks/main.yml | 19 ++++++++++++ .../ansible/roles/config-osa/vars/main.yml | 10 ++++++ .../ansible/roles/post-openstack/tasks/main.yml | 17 ++++++++++ .../ansible/roles/post-openstack/vars/main.yml | 1 + .../ansible/roles/pre-openstack/tasks/Ubuntu.yml | 5 --- .../roles/pre-openstack/templates/sources.list | 36 ---------------------- .../ansible/roles/setup-openvswitch/tasks/main.yml | 2 +- 18 files changed, 223 insertions(+), 42 deletions(-) create mode 100644 deploy/adapters/ansible/roles/config-compute/templates/sources.list.lab create mode 100644 deploy/adapters/ansible/roles/config-compute/templates/sources.list.official create mode 100644 deploy/adapters/ansible/roles/config-compute/vars/main.yml create mode 100644 deploy/adapters/ansible/roles/config-controller/templates/sources.list.lab create mode 100644 deploy/adapters/ansible/roles/config-controller/templates/sources.list.official create mode 100644 deploy/adapters/ansible/roles/config-controller/vars/main.yml create mode 100644 deploy/adapters/ansible/roles/config-osa/files/fetch-openrc.yml create mode 100644 deploy/adapters/ansible/roles/config-osa/vars/main.yml delete mode 100644 deploy/adapters/ansible/roles/pre-openstack/templates/sources.list (limited to 'deploy/adapters/ansible/roles') diff --git a/deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml b/deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml index 886a407f..6e6cae85 100644 --- a/deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml +++ b/deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml @@ -16,10 +16,28 @@ - meta: flush_handlers +- name: check apt source + shell: "ping -c 2 {{ LOCAL_REPOSITORY_IP }} > /dev/null" + register: checkresult + ignore_errors: "true" + +- name: change sources list(apt) + template: + src: sources.list.lab + dest: /etc/apt/sources.list + when: checkresult.rc == 0 + +- name: change sources list(apt) + template: + src: sources.list.official + dest: /etc/apt/sources.list + when: checkresult.rc != 0 + - name: Install apt packages apt: pkg: "nfs-kernel-server" state: "present" + update_cache: "yes" - name: make nfs dircetory file: "dest=/images mode=0777 state=directory" diff --git a/deploy/adapters/ansible/roles/config-compute/templates/sources.list.lab b/deploy/adapters/ansible/roles/config-compute/templates/sources.list.lab new file mode 100644 index 00000000..b1e00d05 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-compute/templates/sources.list.lab @@ -0,0 +1,7 @@ +deb [ arch=amd64 ] http://{{LOCAL_REPOSITORY_IP}}/ubuntu/ xenial main restricted universe multiverse +deb [ arch=amd64 ] http://{{LOCAL_REPOSITORY_IP}}/ubuntu/ xenial-security main restricted universe multiverse +deb [ arch=amd64 ] http://{{LOCAL_REPOSITORY_IP}}/ubuntu/ xenial-updates main restricted universe multiverse + +deb-src [ arch=amd64 ] http://{{LOCAL_REPOSITORY_IP}}/ubuntu/ xenial main restricted universe multiverse +deb-src [ arch=amd64 ] http://{{LOCAL_REPOSITORY_IP}}/ubuntu/ xenial-security main restricted universe multiverse +deb-src [ arch=amd64 ] http://{{LOCAL_REPOSITORY_IP}}/ubuntu/ xenial-updates main restricted universe multiverse diff --git a/deploy/adapters/ansible/roles/config-compute/templates/sources.list.official b/deploy/adapters/ansible/roles/config-compute/templates/sources.list.official new file mode 100644 index 00000000..799e4b58 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-compute/templates/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/roles/config-compute/vars/main.yml b/deploy/adapters/ansible/roles/config-compute/vars/main.yml new file mode 100644 index 00000000..783ea0d0 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-compute/vars/main.yml @@ -0,0 +1,10 @@ +# ############################################################################# +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# ############################################################################# +--- +LOCAL_REPOSITORY_IP: "192.168.137.222" diff --git a/deploy/adapters/ansible/roles/config-controller/tasks/Ubuntu.yml b/deploy/adapters/ansible/roles/config-controller/tasks/Ubuntu.yml index 53c2d502..c878ab7f 100644 --- a/deploy/adapters/ansible/roles/config-controller/tasks/Ubuntu.yml +++ b/deploy/adapters/ansible/roles/config-controller/tasks/Ubuntu.yml @@ -13,3 +13,20 @@ dest: /etc/network/interfaces notify: - restart network service + +- name: check apt source + shell: "ping -c 2 {{LOCAL_REPOSITORY_IP}} > /dev/null" + register: checkresult + ignore_errors: "true" + +- name: change sources list(apt) + template: + src: sources.list.lab + dest: /etc/apt/sources.list + when: checkresult.rc == 0 + +- name: change sources list(apt) + template: + src: sources.list.official + dest: /etc/apt/sources.list + when: checkresult.rc != 0 diff --git a/deploy/adapters/ansible/roles/config-controller/templates/sources.list.lab b/deploy/adapters/ansible/roles/config-controller/templates/sources.list.lab new file mode 100644 index 00000000..b1e00d05 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-controller/templates/sources.list.lab @@ -0,0 +1,7 @@ +deb [ arch=amd64 ] http://{{LOCAL_REPOSITORY_IP}}/ubuntu/ xenial main restricted universe multiverse +deb [ arch=amd64 ] http://{{LOCAL_REPOSITORY_IP}}/ubuntu/ xenial-security main restricted universe multiverse +deb [ arch=amd64 ] http://{{LOCAL_REPOSITORY_IP}}/ubuntu/ xenial-updates main restricted universe multiverse + +deb-src [ arch=amd64 ] http://{{LOCAL_REPOSITORY_IP}}/ubuntu/ xenial main restricted universe multiverse +deb-src [ arch=amd64 ] http://{{LOCAL_REPOSITORY_IP}}/ubuntu/ xenial-security main restricted universe multiverse +deb-src [ arch=amd64 ] http://{{LOCAL_REPOSITORY_IP}}/ubuntu/ xenial-updates main restricted universe multiverse diff --git a/deploy/adapters/ansible/roles/config-controller/templates/sources.list.official b/deploy/adapters/ansible/roles/config-controller/templates/sources.list.official new file mode 100644 index 00000000..799e4b58 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-controller/templates/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/roles/config-controller/vars/main.yml b/deploy/adapters/ansible/roles/config-controller/vars/main.yml new file mode 100644 index 00000000..783ea0d0 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-controller/vars/main.yml @@ -0,0 +1,10 @@ +# ############################################################################# +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# ############################################################################# +--- +LOCAL_REPOSITORY_IP: "192.168.137.222" diff --git a/deploy/adapters/ansible/roles/config-osa/files/fetch-openrc.yml b/deploy/adapters/ansible/roles/config-osa/files/fetch-openrc.yml new file mode 100644 index 00000000..1251cbf1 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-osa/files/fetch-openrc.yml @@ -0,0 +1,18 @@ +# ############################################################################# +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# ############################################################################# +--- +- name: Fetch openrc + hosts: utility_all[0] + max_fail_percentage: 20 + user: root + tasks: + - fetch: + src: /root/openrc + dest: /opt/openrc + flat: "yes" diff --git a/deploy/adapters/ansible/roles/config-osa/files/http.yml b/deploy/adapters/ansible/roles/config-osa/files/http.yml index 248fc06d..d5c1e64e 100644 --- a/deploy/adapters/ansible/roles/config-osa/files/http.yml +++ b/deploy/adapters/ansible/roles/config-osa/files/http.yml @@ -1,3 +1,11 @@ +# ############################################################################# +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# ############################################################################# --- - name: change https to http in haproxy configuratio hosts: network_hosts diff --git a/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml b/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml index 57bc5ef1..9f65cd5d 100644 --- a/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml +++ b/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml @@ -1,3 +1,11 @@ +# ############################################################################# +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# ############################################################################# --- - name: Installation and setup of Neutron hosts: neutron_openvswitch_agent diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml index 8246d6e7..aac18153 100644 --- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml @@ -22,6 +22,20 @@ src: user_variables.yml.j2 dest: /etc/openstack_deploy/user_variables.yml +- name: check apt source + shell: "ping -c 2 {{ LOCAL_REPOSITORY_IP }} > /dev/null" + register: checkresult + ignore_errors: "true" + +- name: add mariadb local repository + blockinfile: + dest: /etc/openstack_deploy/user_variables.yml + block: | + galera_client_apt_repo_url: "http://192.168.137.222/mariadb" + galera_repo_url: "[ arch=amd64 ] http://192.168.137.222/mariadb" + uca_apt_repo_url: "[ arch=amd64 ] http://192.168.137.222/ubuntu-cloud" + when: checkresult.rc == 0 + - name: copy cinder.yml copy: src: cinder.yml @@ -56,3 +70,8 @@ copy: src: http.yml dest: /opt/openstack-ansible/playbooks/http.yml + +- name: copy fetch-openrc.yml + copy: + src: fetch-openrc.yml + dest: /opt/openstack-ansible/playbooks/fetch-openrc.yml diff --git a/deploy/adapters/ansible/roles/config-osa/vars/main.yml b/deploy/adapters/ansible/roles/config-osa/vars/main.yml new file mode 100644 index 00000000..783ea0d0 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-osa/vars/main.yml @@ -0,0 +1,10 @@ +# ############################################################################# +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# ############################################################################# +--- +LOCAL_REPOSITORY_IP: "192.168.137.222" diff --git a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml index d5182c95..63df7260 100644 --- a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml +++ b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml @@ -21,3 +21,20 @@ shell: "export ANSIBLE_LOG_PATH=/var/ansible/run/openstack_ocata-opnfv2/ansible.log; \ cd /opt/openstack-ansible/playbooks; \ openstack-ansible http.yml > /dev/null" + +- name: run ansible yml to fetch openrc + shell: "export ANSIBLE_LOG_PATH=/var/ansible/run/openstack_ocata-opnfv2/ansible.log; \ + cd /opt/openstack-ansible/playbooks; \ + openstack-ansible fetch-openrc.yml > /dev/null" + +- name: replace internalURL with publicURL in openrc + replace: + dest: /opt/openrc + regexp: "{{internal_vip}}" + replace: "{{ public_vip['ip']}}" + +- name: change the endpoint type + replace: + dest: /opt/openrc + regexp: "internalURL" + replace: "publicURL" diff --git a/deploy/adapters/ansible/roles/post-openstack/vars/main.yml b/deploy/adapters/ansible/roles/post-openstack/vars/main.yml index d9c36d42..19d9e225 100644 --- a/deploy/adapters/ansible/roles/post-openstack/vars/main.yml +++ b/deploy/adapters/ansible/roles/post-openstack/vars/main.yml @@ -7,6 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- +internal_vip: "10.1.0.22" flavors: - id: 0 name: m1.nano 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 - diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml index f636ed10..a424f974 100644 --- a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml +++ b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml @@ -12,5 +12,5 @@ cd /opt/openstack-ansible/playbooks; \ openstack-ansible setup-ovs.yml \ | tee -a /var/log/osa/ovs.log > /dev/null" - when: NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch" or \ + when: NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch" or NEUTRON_MECHANISM_DRIVERS[0] == "opendaylight" -- cgit 1.2.3-korg