openstack
/
octavia
Code Issues Proposed changes

Fix configured haproxy restarts 

In the unlikely even that the haproxy restarts after being
configured, if the amphora is using systemd, the haproxy may
fail to start. This is due to a missing "peer ID" command line option.
This patch fixes the systemd unit to have the required "peer ID".

Change-Id: I79cfc9a2e53b249337a189bdb08d13b24807021e
Story: 2002638
Task: 22294
This commit is contained in:
Michael Johnson 2018-06-21 10:22:57 -07:00
parent d0476469ae
commit 7564834b01
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/amphorae/backends/agent/api_server/templates/systemd.conf.j2
View File

@ -11,7 +11,7 @@ SELinuxContext=system_u:system_r:haproxy_t:s0
Environment="CONFIG={{ haproxy_cfg }}" "USERCONFIG={{ haproxy_user_group_cfg }}" "PIDFILE={{ haproxy_pid }}"
ExecStartPre={{ haproxy_cmd }} -f $CONFIG -f $USERCONFIG -c -q
ExecStartPre={{ haproxy_cmd }} -f $CONFIG -f $USERCONFIG -c -q -L {{ peer_name }}
ExecReload={{ haproxy_cmd }} -c -f $CONFIG -f $USERCONFIG -L {{ peer_name }}
ExecReload=/bin/kill -USR2 $MAINPID