aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwutianwei <wutianwei1@huawei.com>2018-05-03 10:38:44 +0800
committerwutianwei <wutianwei1@huawei.com>2018-05-04 01:09:43 +0000
commit411360423e9ba80259ecb527b35b4722f5b87205 (patch)
treec93f65d407840716bf959c094a755f94821a05fb
parentab73374e424a679cc42b9812e6bd39a49fcea07d (diff)
add the command "rm /etc/resolve.conf" in cache_prep_commands
Change-Id: I89b15e7e200d37ac5d44cfee974f0f1c63981625 Signed-off-by: wutianwei <wutianwei1@huawei.com>
-rwxr-xr-xdeploy/adapters/ansible/roles/config-osa/tasks/main.yml12
1 files changed, 12 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index 74d930e..7e2585c 100755
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -362,6 +362,18 @@
insertafter: "^- include: os-trove"
line: "- include: os-tacker-install.yml"
+- name: rm command "rm -f /etc/resolv.conf" in cache_prep_commands
+ lineinfile:
+ dest: /etc/ansible/roles/lxc_hosts/vars/ubuntu-16.04.yml
+ regexp: 'rm -f /etc/resolv.conf$'
+ line: ' echo "ok"'
+
+- name: add command "rm /etc/resolv.conf || true" in cache_prep_commands
+ lineinfile:
+ dest: /etc/ansible/roles/lxc_hosts/vars/ubuntu-16.04.yml
+ insertafter: '^ cache_prep_commands:'
+ line: ' rm /etc/resolv.conf || true'
+
- name: add variables file of tacker for centos
copy:
src: redhat-7.yml