diff options
Diffstat (limited to 'deploy')
7 files changed, 42 insertions, 42 deletions
diff --git a/deploy/adapters/ansible/openstack/group_vars/all b/deploy/adapters/ansible/openstack/group_vars/all index 79859d0c..54fdabe1 100644 --- a/deploy/adapters/ansible/openstack/group_vars/all +++ b/deploy/adapters/ansible/openstack/group_vars/all @@ -38,6 +38,7 @@ NEUTRON_TUNNEL_TYPES: ['vxlan'] METADATA_SECRET: metadata_secret INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21 INTERFACE_NAME: eth2 +DNS: 8.8.8.8 EXTERNAL_NETWORK_CIDR: 203.0.113.0/24 EXTERNAL_NETWORK_GATEWAY: 203.0.113.1 diff --git a/deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml b/deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml index 886a407f..4bf243b5 100644 --- a/deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml +++ b/deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml @@ -7,6 +7,12 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- +- name: remove resolv.conf + file: "dest=/etc/resolv.conf state=absent" + +- name: make a symbolic link + shell: "ln -s /var/run/resolvconf/resolv.conf /etc/resolv.conf" + - name: configure network template: src: compute.j2 diff --git a/deploy/adapters/ansible/roles/config-compute/templates/compute.j2 b/deploy/adapters/ansible/roles/config-compute/templates/compute.j2 index 8337fbcb..9a734385 100644 --- a/deploy/adapters/ansible/roles/config-compute/templates/compute.j2 +++ b/deploy/adapters/ansible/roles/config-compute/templates/compute.j2 @@ -69,6 +69,7 @@ iface br-vlan inet static # -- Putting this here is primarily for tempest to work. address {{host_info[inventory_hostname].VLAN_IP_SECOND}} netmask 255.255.252.0 + dns-nameservers {{ DNS }} # compute1 Storage bridge auto br-storage diff --git a/deploy/adapters/ansible/roles/config-controller/templates/controller.j2 b/deploy/adapters/ansible/roles/config-controller/templates/controller.j2 index a4f073f0..d28297db 100755 --- a/deploy/adapters/ansible/roles/config-controller/templates/controller.j2 +++ b/deploy/adapters/ansible/roles/config-controller/templates/controller.j2 @@ -53,7 +53,7 @@ iface br-vlan inet static address {{ ip_settings[inventory_hostname]["br-prv"]["ip"] }} netmask 255.255.255.0 gateway {{ ip_settings[inventory_hostname]["br-prv"]["gw"] }} - dns-nameserver 8.8.8.8 8.8.4.4 + dns-nameservers {{ DNS }} # compute1 Storage bridge auto br-storage 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 diff --git a/deploy/adapters/ansible/roles/setup-host/tasks/main.yml b/deploy/adapters/ansible/roles/setup-host/tasks/main.yml index e22b3c60..e7aabcbb 100644 --- a/deploy/adapters/ansible/roles/setup-host/tasks/main.yml +++ b/deploy/adapters/ansible/roles/setup-host/tasks/main.yml @@ -18,7 +18,18 @@ shell: cat /var/log/osa/host.log | tail -n 500 | grep failed=1 |awk '{print $1}' register: failed_container -- name: echo failed_container +- name: destroy the failed_container + shell: "export ANSIBLE_LOG_PATH=/var/ansible/run/openstack_ocata-opnfv2/ansible.log; \ + export ANSIBLE_SCP_IF_SSH=y; \ + cd /opt/openstack-ansible/playbooks; \ + openstack-ansible lxc-containers-destroy.yml \ + -e container_name={{item}} -e force_containers_destroy=yes \ + -e force_containers_data_destroy=yes > /dev/null;" + with_items: + - "{{ failed_container.stdout_lines }}" + ignore_errors: True + +- name: retry to setup failed_container shell: "export ANSIBLE_LOG_PATH=/var/ansible/run/openstack_ocata-opnfv2/ansible.log; \ export ANSIBLE_SCP_IF_SSH=y; \ cd /opt/openstack-ansible/playbooks; \ diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl index cca66f1d..b4ea6e04 100755 --- a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl +++ b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl @@ -149,6 +149,7 @@ ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD cluster_name: $cluster_name +DNS: 8.8.8.8 odl_controller: 10.1.0.15 DEBUG: true |