Juju Charms Collection
swift-storage package

Merge lp://qastaging/~gnuoy/charms/trusty/swift-storage/add-nrpe-checks-fix-rsyncd-conf into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/next

Proposed by Liam Young on 2015-01-12

Status:	Merged
Merged at revision:	55
Proposed branch:	lp://qastaging/~gnuoy/charms/trusty/swift-storage/add-nrpe-checks-fix-rsyncd-conf
Merge into:	lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/next
Diff against target:	451 lines (+160/-69) 10 files modified hooks/charmhelpers/contrib/charmsupport/nrpe.py (+94/-5) hooks/charmhelpers/contrib/charmsupport/rsync.py (+0/-32) hooks/charmhelpers/contrib/charmsupport/volumes.py (+5/-2) hooks/charmhelpers/contrib/openstack/context.py (+1/-0) hooks/charmhelpers/contrib/openstack/neutron.py (+8/-2) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+2/-0) hooks/charmhelpers/contrib/openstack/utils.py (+6/-0) hooks/charmhelpers/fetch/__init__.py (+8/-1) hooks/swift_storage_hooks.py (+12/-27) hooks/swift_storage_utils.py (+24/-0)
To merge this branch:	bzr merge lp://qastaging/~gnuoy/charms/trusty/swift-storage/add-nrpe-checks-fix-rsyncd-conf
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Liam Young (community)			Approve on 2015-01-12
Review via email: mp+246161@code.qastaging.launchpad.net

Description of the change

Add nrpe support. Based on branch from bradm with a few tweaks

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-01-12:

charm_lint_check #670 swift-storage-next for gnuoy mp246161
LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/670/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-01-12:

charm_unit_test #699 swift-storage-next for gnuoy mp246161
UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/699/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-01-12:

charm_amulet_test #855 swift-storage-next for gnuoy mp246161
AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/855/

Revision history for this message

Liam Young (gnuoy) wrote on 2015-01-12:

<jamespage> gnuoy, as they are re-syncs + tweaks to the nrpe stuff in the charms, I'm happy to give a conditional +1 across the board based on osci checking things out OK
<gnuoy> jamespage, I'll take that! thanks
...
<gnuoy> jamespage, osci is still working through. But on the subject of those mps, does your +1 stand for branches with no amulet tests?
<jamespage> gnuoy, yes

review: Approve