Merge lp://qastaging/~brad-marshall/charms/trusty/hacluster/add-nrpe-checks-update-charmhelpers into lp://qastaging/~openstack-charmers/charms/trusty/hacluster/next
Proposed by
Billy Olsen
Status: | Merged |
---|---|
Merged at revision: | 46 |
Proposed branch: | lp://qastaging/~brad-marshall/charms/trusty/hacluster/add-nrpe-checks-update-charmhelpers |
Merge into: | lp://qastaging/~openstack-charmers/charms/trusty/hacluster/next |
Diff against target: |
1577 lines (+1456/-1) (has conflicts) 12 files modified
charm-helpers.yaml (+1/-0) config.yaml (+16/-0) files/nrpe/check_corosync_rings (+99/-0) files/nrpe/check_crm (+201/-0) files/sudoers/nagios (+5/-0) hooks/charmhelpers/contrib/charmsupport/__init__.py (+15/-0) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+360/-0) hooks/charmhelpers/contrib/charmsupport/volumes.py (+175/-0) hooks/charmhelpers/core/strutils.py (+42/-0) hooks/charmhelpers/core/unitdata.py (+477/-0) hooks/hooks.py (+62/-1) metadata.yaml (+3/-0) Conflict adding file hooks/charmhelpers/core/strutils.py. Moved existing file to hooks/charmhelpers/core/strutils.py.moved. Conflict adding file hooks/charmhelpers/core/unitdata.py. Moved existing file to hooks/charmhelpers/core/unitdata.py.moved. |
To merge this branch: | bzr merge lp://qastaging/~brad-marshall/charms/trusty/hacluster/add-nrpe-checks-update-charmhelpers |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Billy Olsen | Needs Information | ||
OpenStack Charmers | Pending | ||
Review via email: mp+249570@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2015-02-12.
Description of the change
Adding nrpe checks to the hacluster to check the status of corosync.
To post a comment you must log in.
Brad, thanks for the submission! The hacluster charm is maintained by the openstack-charmers team and development operates off the /next branch. I've re-targeted this merge proposal towards the /next branch.