From: Assaf Muller <amuller@redhat.com>
Date: Mon, 19 Jan 2015 18:55:49 +0000 (-0500)
Subject: SIGHUP keepalived if L3 agent restarts
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=babdc213744a3f08a7d6d781cf29cb4a870abc65;p=openstack-build%2Fneutron-build.git

SIGHUP keepalived if L3 agent restarts

Currently restarting the L3 agent does not SIGHUP any running
keepalived processes. This is an issue if the L3 agent crashes
and is then restarted by an external tool. In this case, the L3
agent resyncs with the controller but does not SIGHUP keepalived.

It's also an issue during upgrades.

Closes-Bug: #1412542
Change-Id: Iec29b483f499f02c593f6e0663c7f3504c615c1a
---

diff --git a/neutron/agent/linux/keepalived.py b/neutron/agent/linux/keepalived.py
index 596ee6e02..a0fd43f7b 100644
--- a/neutron/agent/linux/keepalived.py
+++ b/neutron/agent/linux/keepalived.py
@@ -402,7 +402,7 @@ class KeepalivedManager(KeepalivedNotifierMixin):
                    '-r', '%s-vrrp' % pid_file]
             return cmd
 
-        self.process.enable(callback)
+        self.process.enable(callback, reload_cfg=True)
 
         self.spawned = True
         LOG.debug('Keepalived spawned with config %s', config_path)