Charm Helpers

Merge lp:~billy-olsen/charm-helpers/haproxy-admin-socket into lp:charm-helpers

  1. haproxy-admin-socket
  2. Merge into devel
Proposed by Billy Olsen
Status: Merged
Merged at revision: 727
Proposed branch: lp:~billy-olsen/charm-helpers/haproxy-admin-socket
Merge into: lp:charm-helpers
Diff against target: 12 lines (+2/-0)
1 file modified
charmhelpers/contrib/openstack/templates/haproxy.cfg (+2/-0)
To merge this branch: bzr merge lp:~billy-olsen/charm-helpers/haproxy-admin-socket
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+321373@code.launchpad.net
To post a comment you must log in.
Revision history for this message
David Ames (thedac) wrote :

Looks good. Merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/templates/haproxy.cfg'
2--- charmhelpers/contrib/openstack/templates/haproxy.cfg 2016-01-06 22:04:12 +0000
3+++ charmhelpers/contrib/openstack/templates/haproxy.cfg 2017-03-29 21:13:31 +0000
4@@ -5,6 +5,8 @@
5 user haproxy
6 group haproxy
7 spread-checks 0
8+ stats socket /var/run/haproxy/admin.sock mode 600 level admin
9+ stats timeout 2m
10
11 defaults
12 log global

Subscribers

People subscribed via source and target branches