add the command "rm /etc/resolve.conf" in cache_prep_commands

Change-Id: I89b15e7e200d37ac5d44cfee974f0f1c63981625
Signed-off-by: wutianwei <wutianwei1@huawei.com>

diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index 74d930e..766043d 100755 (executable)
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -362,6 +362,19 @@
     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"'
+    backrefs: 'yes'
+
+- 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