Skip to content

Synchronise 2023.1 with upstream #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 3, 2025
Merged

Synchronise 2023.1 with upstream #197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion neutron/agent/linux/keepalived.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

from neutron._i18n import _
from neutron.agent.linux import external_process
from neutron.agent.linux import utils as linux_utils
from neutron.cmd import runtime_checks as checks
from neutron.common import utils

Expand Down Expand Up @@ -504,8 +505,12 @@ def callback(pid_file):
# will be orphan and prevent keepalived process to be spawned.
# A check here will let the l3-agent to kill the orphan process
# and spawn keepalived successfully.
# Also removes stale pid file
if vrrp_pm.active:
vrrp_pm.disable()
vrrp_pm.disable(delete_pid_file=False)

linux_utils.delete_if_exists(self.get_vrrp_pid_file_name(pid_file),
run_as_root=vrrp_pm.run_as_root)

cmd = ['keepalived', '-P',
'-f', config_path,
Expand Down