openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Revert "Add workaround for reloading haproxy on Fedora""

This commit is contained in:
Jenkins 2014-08-28 15:18:19 +00:00 committed by Gerrit Code Review
parent 1128e31eff be5594159a
commit 6a2db8f912
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
elements/haproxy/install.d/76-haproxy
View File

@ -7,24 +7,6 @@ install-packages haproxy
[ -d /var/lib/haproxy ] || install -d -D -m 0755 -o root -g root /var/lib/haproxy
if [ "$DIB_INIT_SYSTEM" == "systemd" ] ; then
# https://bugzilla.redhat.com/show_bug.cgi?id=1126955
# The haproxy service file on Fedora is broken for reloads right now, so
# replace it with a fixed version. Once the bug above is fixed we can
# remove this workaround.
if [ -f /lib/systemd/system/haproxy.service -a -f /usr/sbin/haproxy-systemd-wrapper ]; then
cat > /lib/systemd/system/haproxy.service <<EOF
[Unit]
Description=HAProxy Load Balancer
After=syslog.target network.target
[Service]
ExecStart=/usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid
ExecReload=/bin/kill -USR2 \$MAINPID
[Install]
WantedBy=multi-user.target
EOF
fi
systemctl enable haproxy.service
fi