]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
SIGHUP keepalived if L3 agent restarts
authorAssaf Muller <amuller@redhat.com>
Mon, 19 Jan 2015 18:55:49 +0000 (13:55 -0500)
committerAssaf Muller <amuller@redhat.com>
Tue, 20 Jan 2015 14:36:16 +0000 (09:36 -0500)
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

neutron/agent/linux/keepalived.py

index 596ee6e0240b73eb2050ae84fb7de054a0d7775b..a0fd43f7bde5fa920373e452f85ab03698b92c7e 100644 (file)
@@ -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)