Merge lp://staging/~brad-marshall/charms/trusty/glance/add-haproxy-nrpe-fix-servicegroups into lp://staging/~openstack-charmers-archive/charms/trusty/glance/trunk
Proposed by
Brad Marshall
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~brad-marshall/charms/trusty/glance/add-haproxy-nrpe-fix-servicegroups |
| Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/glance/trunk |
| Diff against target: |
1101 lines (+738/-43) 20 files modified
config.yaml (+6/-0) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+40/-6) hooks/charmhelpers/contrib/hahelpers/cluster.py (+5/-1) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2) hooks/charmhelpers/contrib/openstack/files/__init__.py (+18/-0) hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+32/-0) hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+30/-0) hooks/charmhelpers/contrib/openstack/ip.py (+37/-0) hooks/charmhelpers/contrib/openstack/utils.py (+1/-0) hooks/charmhelpers/contrib/python/packages.py (+2/-2) hooks/charmhelpers/core/fstab.py (+4/-4) hooks/charmhelpers/core/host.py (+5/-5) hooks/charmhelpers/core/strutils.py (+42/-0) hooks/charmhelpers/core/sysctl.py (+13/-7) hooks/charmhelpers/core/templating.py (+3/-3) hooks/charmhelpers/core/unitdata.py (+477/-0) hooks/charmhelpers/fetch/archiveurl.py (+10/-10) hooks/charmhelpers/fetch/giturl.py (+1/-1) hooks/glance_relations.py (+2/-0) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2) |
| To merge this branch: | bzr merge lp://staging/~brad-marshall/charms/trusty/glance/add-haproxy-nrpe-fix-servicegroups |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-02-19.
Description of the change
Synced charmhelpers, added nagios_servicegroup config option, and added haproxy nrpe checks.
To post a comment you must log in.
Unmerged revisions
- 97. By Corey Bryant
-
[coreycb,trivial] Switch Amulet tests to use stable branches
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
