Comment 18 for bug 1561046

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to neutron (stable/kilo)

Reviewed: https://review.openstack.org/299137
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=d2447c56ab3b945a32a711fe9068d776179bae8a
Submitter: Jenkins
Branch: stable/kilo

commit d2447c56ab3b945a32a711fe9068d776179bae8a
Author: Hynek Mlnarik <email address hidden>
Date: Wed Mar 23 14:51:59 2016 +0100

    Remove obsolete keepalived PID files before start

    keepalived refuses to start and claims "daemon already started"
    when there is already a process with the same PID as found in
    either the VRRP or the main process PID file. This happens even
    in case when the new process is not keepalived. The situation
    can happen when the neutron node is reset and the obsolete PID
    files are not cleaned before neutron is started.

    This commit adds PID file cleanup before keepalived start.

    Compared to upstream commit, the fixture in test_keepalived was adjusted
    for kilo's version of fixtures package.

    Conflicts:
        neutron/agent/linux/keepalived.py

    Closes-Bug: 1561046
    Change-Id: Ib6b6f2fe76fe82253f195c9eab6b243d9eb76fa2
    (cherry picked from commit e98fabb5836b12bc40a2b64a2668893ea73c2320)