From a60e70f7375a7371b0295d7eb659a7204b402d91 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Tue, 6 Nov 2018 15:53:30 +0800 Subject: Increase vif_plugging_timeout to 30 JIAR: - Change-Id: Icef7132b3f74a5614bfb54bdf38a8aa6fd779a72 Signed-off-by: Harry Huang --- deploy/adapters/ansible/roles/config-osa/tasks/main.yml | 17 +++++------------ .../ansible/roles/post-openstack/tasks/main.yml | 9 --------- 2 files changed, 5 insertions(+), 21 deletions(-) (limited to 'deploy') diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml index 2be4e646..05034001 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 0efa1cdf..0bd9aeff 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'] -- cgit 1.2.3-korg