aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-11-06 15:53:30 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2018-11-06 15:55:29 +0800
commita60e70f7375a7371b0295d7eb659a7204b402d91 (patch)
tree9133fa304d56c49f1dc4f807454e973935fb4f46
parent43aad4c8b7f25976001067130b55486ad5ba98b4 (diff)
Increase vif_plugging_timeout to 30
JIAR: - Change-Id: Icef7132b3f74a5614bfb54bdf38a8aa6fd779a72 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
-rwxr-xr-xdeploy/adapters/ansible/roles/config-osa/tasks/main.yml17
-rw-r--r--deploy/adapters/ansible/roles/post-openstack/tasks/main.yml9
2 files changed, 5 insertions, 21 deletions
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
--- 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
--- 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']