Juju Charms Collection
rabbitmq-server package

Merge lp://staging/~bloodearnest/charms/trusty/rabbitmq-server/add-nagios-service-groups into lp://staging/charms/trusty/rabbitmq-server

Proposed by Simon Davy on 2015-03-04

Status:	Work in progress
Proposed branch:	lp://staging/~bloodearnest/charms/trusty/rabbitmq-server/add-nagios-service-groups
Merge into:	lp://staging/charms/trusty/rabbitmq-server
Diff against target:	1394 lines (+836/-131) 21 files modified config.yaml (+6/-0) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+41/-7) hooks/charmhelpers/contrib/hahelpers/cluster.py (+5/-1) hooks/charmhelpers/contrib/network/ip.py (+84/-1) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2) hooks/charmhelpers/contrib/openstack/context.py (+62/-10) hooks/charmhelpers/contrib/openstack/files/__init__.py (+18/-0) hooks/charmhelpers/contrib/openstack/ip.py (+37/-0) hooks/charmhelpers/contrib/openstack/utils.py (+7/-72) 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/services/helpers.py (+12/-4) 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) unit_tests/test_rabbit_utils.py (+1/-1) unit_tests/test_rabbitmq_server_relations.py (+1/-1)
To merge this branch:	bzr merge lp://staging/~bloodearnest/charms/trusty/rabbitmq-server/add-nagios-service-groups
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Marco Ceppi (community)	2015-03-04	Needs Fixing on 2015-03-24
Cory Johns (community)		Approve on 2015-03-24
Review via email: mp+251790@code.staging.launchpad.net

Commit message

Add nagios_servicegroups config, and update to latest charmhelpers to get sane default behaviour for when nagios_servicegroups is not set.

Description of the change

Add nagios_servicegroups config, and update to latest charmhelpers to get sane default behaviour for when nagios_servicegroups is not set.

lp://staging/~bloodearnest/charms/trusty/rabbitmq-server/add-nagios-service-groups updated on 2015-03-04

84. By Simon Davy on 2015-03-04: typo

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-03-04:

charm_unit_test #2256 rabbitmq-server for bloodearnest mp251790
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-03-04:

charm_lint_check #2466 rabbitmq-server for bloodearnest mp251790
LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
unit_tests/test_rabbitmq_server_relations.py:6:1: E402 module level import not at top of file
make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10529446/
Build: http://10.245.162.77:8080/job/charm_lint_check/2466/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-03-04:

charm_amulet_test #2342 rabbitmq-server for bloodearnest mp251790
AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
ERROR subprocess encountered error code 1
make: *** [functional_test] Error 1

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

lp://staging/~bloodearnest/charms/trusty/rabbitmq-server/add-nagios-service-groups updated on 2015-03-05

85. By Simon Davy on 2015-03-05: fix lint issues

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-03-05:

charm_unit_test #2264 rabbitmq-server for bloodearnest mp251790
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-03-05:

charm_lint_check #2474 rabbitmq-server for bloodearnest mp251790
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-03-05:

charm_amulet_test #2347 rabbitmq-server for bloodearnest mp251790
AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
ERROR subprocess encountered error code 1
make: *** [functional_test] Error 1

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

Revision history for this message

Cory Johns (johnsca) wrote on 2015-03-24:

Simon,

The CI failure appears to be due to a cert issue in the upstream branch, which has been reported in this bug: https://bugs.launchpad.net/charms/+source/rabbitmq-server/+bug/1436014

The changes in this MP seem reasonable, and setting and unsetting the new config option seems to work without error (although I am not entirely clear how to verify the expected result), so I'm willing to give this MP my +1. However, getting the test failure fixed upstream will very much make these reviews cleaner going forward.

review: Approve

Revision history for this message

Marco Ceppi (marcoceppi) wrote on 2015-03-24:

This conflicts with the current upstream, can you merge and resolve?

review: Needs Fixing

Unmerged revisions

85. By Simon Davy on 2015-03-05: fix lint issues
84. By Simon Davy on 2015-03-04: typo
83. By Simon Davy on 2015-03-04: Add nagios_servicegroups config, and update to latest charmhelpers to get sane default behaviour for when nagios_servicegroups is not set