Increase vif_plugging_timeout to 30

JIAR: -

Change-Id: Icef7132b3f74a5614bfb54bdf38a8aa6fd779a72
Signed-off-by: Harry Huang <huangxiangyu5@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 2be4e64..0503400 100755 (executable)
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -429,15 +429,8 @@
     - checkresult.rc == 0
     - offline_deployment is defined and offline_deployment == "Disable"
 
-- name: Add sleep in host_power_action
-  blockinfile:
-    dest: /etc/ansible/roles/repo_build/tasks/repo_clone_git.yml
-    block: |
-      {% raw %}
-      - name: Add sleep in host_power_action
-        shell:
-          sed -i '/return self.driver.host_power_action/i\        time.sleep(2)' manager.py
-        args:
-          chdir: "{{ repo_build_git_dir}}/nova/nova/compute"
-        ignore_errors: true
-      {% endraw %}
+- name: increase vif_plugging_timeout
+  lineinfile:
+    dest: /etc/ansible/roles/os_nova/templates/nova.conf.j2
+    regexp: '^vif_plugging_timeout'
+    line: 'vif_plugging_timeout = 30'

diff --git a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
index 0efa1cd..0bd9aef 100644 (file)
--- a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
@@ -86,12 +86,3 @@
     state: restarted
   when:
     - inventory_hostname in groups['horizon']
-
-- name: add sleep in nova
-  shell:
-    sed -i '/return self.driver.host_power_action/i\        time.sleep(2)' manager.py
-  args:
-    chdir: /openstack/venvs/nova-{{ openstack_release }}/lib/python2.7/site-packages/nova/compute
-  ignore_errors: true
-  when:
-    - inventory_hostname in groups['compute']