From: Harry Huang <huangxiangyu5@huawei.com>
Date: Tue, 4 Dec 2018 01:58:35 +0000 (+0800)
Subject: Fix keepalive restart issue
X-Git-Tag: opnfv-7.1.0~3
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F65551%2F1;p=compass4nfv.git

Fix keepalive restart issue

Change-Id: I4d690b82d2c8c75e2896a7f3575fe3591f719b44
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 05034001..e6794926 100755
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -434,3 +434,9 @@
     dest: /etc/ansible/roles/os_nova/templates/nova.conf.j2
     regexp: '^vif_plugging_timeout'
     line: 'vif_plugging_timeout = 30'
+
+- name: fix keepalived
+  lineinfile:
+    dest: /opt/openstack-ansible/inventory/group_vars/haproxy/keepalived.yml
+    regexp: 'check_script: "/bin/kill -0 `cat /var/run/haproxy.pid`"'
+    line: '    check_script: "/bin/kill -0 `cat /var/run/haproxy.pid` || true"'