Merge lp://staging/~jacekn/charms/precise/haproxy/haproxy-updates into lp://staging/charms/haproxy
Proposed by
Jacek Nykis
| Status: | Merged |
|---|---|
| Merged at revision: | 85 |
| Proposed branch: | lp://staging/~jacekn/charms/precise/haproxy/haproxy-updates |
| Merge into: | lp://staging/charms/haproxy |
| Diff against target: |
5649 lines (+4614/-89) 51 files modified
Makefile (+2/-2) README.md (+51/-2) config.yaml (+59/-0) files/nrpe/check_haproxy.sh (+14/-4) files/nrpe/check_haproxy_queue_depth.sh (+2/-2) hooks/charmhelpers/cli/README.rst (+57/-0) hooks/charmhelpers/cli/__init__.py (+147/-0) hooks/charmhelpers/cli/commands.py (+2/-0) hooks/charmhelpers/cli/host.py (+15/-0) hooks/charmhelpers/contrib/ansible/__init__.py (+165/-0) hooks/charmhelpers/contrib/charmhelpers/IMPORT (+4/-0) hooks/charmhelpers/contrib/charmhelpers/__init__.py (+184/-0) hooks/charmhelpers/contrib/charmsupport/IMPORT (+14/-0) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+1/-3) hooks/charmhelpers/contrib/hahelpers/apache.py (+58/-0) hooks/charmhelpers/contrib/hahelpers/cluster.py (+183/-0) hooks/charmhelpers/contrib/jujugui/IMPORT (+4/-0) hooks/charmhelpers/contrib/jujugui/utils.py (+602/-0) hooks/charmhelpers/contrib/network/ip.py (+69/-0) hooks/charmhelpers/contrib/network/ovs/__init__.py (+75/-0) hooks/charmhelpers/contrib/openstack/alternatives.py (+17/-0) hooks/charmhelpers/contrib/openstack/context.py (+577/-0) hooks/charmhelpers/contrib/openstack/neutron.py (+137/-0) hooks/charmhelpers/contrib/openstack/templates/__init__.py (+2/-0) hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+11/-0) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+37/-0) hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+23/-0) hooks/charmhelpers/contrib/openstack/templating.py (+280/-0) hooks/charmhelpers/contrib/openstack/utils.py (+440/-0) hooks/charmhelpers/contrib/saltstack/__init__.py (+102/-0) hooks/charmhelpers/contrib/ssl/__init__.py (+78/-0) hooks/charmhelpers/contrib/storage/linux/ceph.py (+383/-0) hooks/charmhelpers/contrib/storage/linux/loopback.py (+62/-0) hooks/charmhelpers/contrib/storage/linux/lvm.py (+88/-0) hooks/charmhelpers/contrib/storage/linux/utils.py (+25/-0) hooks/charmhelpers/contrib/templating/contexts.py (+73/-0) hooks/charmhelpers/contrib/templating/pyformat.py (+13/-0) hooks/charmhelpers/core/hookenv.py (+78/-23) hooks/charmhelpers/core/host.py (+66/-14) hooks/charmhelpers/fetch/__init__.py (+84/-12) hooks/charmhelpers/fetch/bzrurl.py (+7/-2) hooks/charmhelpers/payload/__init__.py (+1/-0) hooks/charmhelpers/payload/archive.py (+57/-0) hooks/charmhelpers/payload/execd.py (+50/-0) hooks/hooks.py (+86/-11) hooks/tests/test_config_changed_hooks.py (+1/-0) hooks/tests/test_helpers.py (+67/-9) hooks/tests/test_install.py (+5/-0) hooks/tests/test_reverseproxy_hooks.py (+55/-3) hooks/tests/test_website_hooks.py (+0/-1) metadata.yaml (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~jacekn/charms/precise/haproxy/haproxy-updates |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrew McLeod (community) | Approve | ||
| Tim Van Steenburgh (community) | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
This branch makes a few improvements to the haproxy charm:
- add SSL support
- add nagios_
- multiple monitoring fixes
- add open_monitoring
Please note that all tests related to the changes are passing. There is however one test that is currently failing in the upstream branch, unrelated to my changes. See https:/
To post a comment you must log in.
Revision history for this message
| Barry Price (barryprice) wrote | # |
Revision history for this message
| Cory Johns (johnsca) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hey Jacek,
This looks good, thanks! I went ahead and fixed up the test failures on another branch here: lp:~tvansteenburgh/charms/precise/haproxy/haproxy-updates-test-fixes. If you will merge my fixes into your branch, I'll gladly approve and merge your branch.