Juju Charms Collection
haproxy package

Merge lp:~marcoceppi/charms/precise/haproxy/cfg-changed-fix into lp:charms/haproxy

  1. Precise Pangolin (12.04)
  2. cfg-changed-fix
  3. Merge into trunk
Proposed by Marco Ceppi
Status: Merged
Merged at revision: 71
Proposed branch: lp:~marcoceppi/charms/precise/haproxy/cfg-changed-fix
Merge into: lp:charms/haproxy
Diff against target: 13 lines (+2/-1)
1 file modified
hooks/hooks.py (+2/-1)
To merge this branch: bzr merge lp:~marcoceppi/charms/precise/haproxy/cfg-changed-fix
Reviewer Review Type Date Requested Status
Dave Cheney (community) lgtm. Approve
Review via email: mp+198491@code.launchpad.net

Description of the change

Fix to charm erroring during config-changed

To post a comment you must log in.
Revision history for this message
Dave Cheney (dave-cheney) :
review: Approve (lgtm.)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py 2013-11-04 13:09:04 +0000
+++ hooks/hooks.py 2013-12-11 04:15:12 +0000
@@ -727,7 +727,8 @@
727 else:727 else:
728 haproxy_monitoring = None728 haproxy_monitoring = None
729 remove_services()729 remove_services()
730 create_services()730 if not create_services():
731 sys.exit()
731 haproxy_services = load_services()732 haproxy_services = load_services()
732 update_sysctl(config_data)733 update_sysctl(config_data)
733 construct_haproxy_config(haproxy_globals,734 construct_haproxy_config(haproxy_globals,

Subscribers

People subscribed via source and target branches