aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/config-compute
diff options
context:
space:
mode:
authorwutianwei <wutianwei1@huawei.com>2017-06-28 14:19:02 +0800
committerchigang <chigang@huawei.com>2017-06-30 20:07:48 +0800
commit06b95e349cf3e6bc5d45b7030683d53eeae490ec (patch)
tree06f6aec0638c09ab56a5cdbb9d8d1e5a9fdf0d90 /deploy/adapters/ansible/roles/config-compute
parent81ddb0a110736415cab48240935b436cd6656ac7 (diff)
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 <wutianwei1@huawei.com> Signed-off-by: chigang <chigang@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/config-compute')
-rw-r--r--deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml6
-rw-r--r--deploy/adapters/ansible/roles/config-compute/templates/compute.j21
2 files changed, 7 insertions, 0 deletions
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