Juju Charms Collection
neutron-api package

Merge lp://qastaging/~gnuoy/charms/trusty/neutron-api/add-nrpe-checks into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

Proposed by Liam Young on 2015-01-12

Status:	Merged
Merged at revision:	70
Proposed branch:	lp://qastaging/~gnuoy/charms/trusty/neutron-api/add-nrpe-checks
Merge into:	lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target:	662 lines (+520/-1) 10 files modified charm-helpers-sync.yaml (+1/-0) config.yaml (+10/-0) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+308/-0) hooks/charmhelpers/contrib/charmsupport/volumes.py (+159/-0) hooks/charmhelpers/contrib/openstack/utils.py (+6/-0) hooks/charmhelpers/fetch/__init__.py (+8/-1) hooks/neutron_api_hooks.py (+16/-0) hooks/neutron_api_utils.py (+8/-0) metadata.yaml (+3/-0) unit_tests/test_neutron_api_hooks.py (+1/-0)
To merge this branch:	bzr merge lp://qastaging/~gnuoy/charms/trusty/neutron-api/add-nrpe-checks
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Liam Young (community)			Approve on 2015-01-12
Review via email: mp+246153@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 #674 neutron-api-next for gnuoy mp246153
LINT OK: passed

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

Revision history for this message

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

charm_unit_test #703 neutron-api-next for gnuoy mp246153
UNIT OK: passed

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

Revision history for this message

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

charm_amulet_test #859 neutron-api-next for gnuoy mp246153
AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/9718885/
Build: http://10.245.162.77:8080/job/charm_amulet_test/859/

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