Juju Charms Collection
rabbitmq-server package

Merge lp://staging/~niedbalski/charms/trusty/rabbitmq-server/fix-1442443 into lp://staging/charms/trusty/rabbitmq-server

Trusty Tahr (14.04)
fix-1442443
Merge into trunk

Proposed by Jorge Niedbalski on 2015-04-10

Status:

Superseded

Proposed branch:

lp://staging/~niedbalski/charms/trusty/rabbitmq-server/fix-1442443

Merge into:

lp://staging/charms/trusty/rabbitmq-server

Diff against target:

746 lines (+373/-168)

11 files modified

config.yaml (+7/-1)
hooks/rabbit_utils.py (+37/-39)
hooks/rabbitmq_context.py (+125/-0)
hooks/rabbitmq_server_relations.py (+7/-113)
hooks/ssl_utils.py (+55/-0)
templates/rabbitmq.config (+25/-11)
tests/00_setup.sh (+3/-0)
tests/50_test_cluster_partition.py (+31/-0)
unit_tests/test_rabbit_utils.py (+1/-1)
unit_tests/test_rabbitmq_context.py (+79/-0)
unit_tests/test_rabbitmq_server_relations.py (+3/-3)

To merge this branch:

bzr merge lp://staging/~niedbalski/charms/trusty/rabbitmq-server/fix-1442443

Critical

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Billy Olsen	2015-04-10	Needs Fixing on 2015-04-10
OpenStack Charmers	2015-04-10	Pending
Review via email: mp+255770@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-04-10.

Description of the change

- Added the cluster_partition_handling option fixes LP: #1442443
- Refactored the ssl handling code.
- Added a generic config loader

Revision history for this message

Billy Olsen (billy-olsen) wrote on 2015-04-10:

Jorge,

I think some of the refactor in here is a definite improvement and makes things cleaner, thanks! I've got a few inline comments included, but the biggest thing is that the rabbitmq-server charm now has a /next and /trunk branch to match the rest of the flow of the openstack charms (since this has recently come under ownership of the ~openstack-charmers team). Can you retarget for /next?

Also, I think the README file should be updated with some discussions regarding high availability.

I'll run through some tests on this but wanted to drop some feedback now.

review: Needs Fixing

Revision history for this message

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

charm_lint_check #3202 rabbitmq-server for niedbalski mp255770
LINT OK: passed

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

Revision history for this message

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

charm_unit_test #2990 rabbitmq-server for niedbalski mp255770
UNIT OK: passed

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

Revision history for this message

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

charm_amulet_test #3019 rabbitmq-server for niedbalski mp255770
AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

lp://staging/~niedbalski/charms/trusty/rabbitmq-server/fix-1442443 updated on 2015-09-28

89. By Liam Young on 2015-04-16: [gnuoy,trivial] Pre-release charmhelper sync
90. By James Page on 2015-04-16: [wolsen,r=james-page] Fixup SSL tests to not fail when certs expire!
91. By Jorge Niedbalski on 2015-04-17: Rebase commit
92. By Jorge Niedbalski on 2015-09-23: Rebase
93. By Jorge Niedbalski on 2015-09-23: addressing @dosaboy comments
94. By Jorge Niedbalski on 2015-09-23: addressing @dosaboy comments
95. By Jorge Niedbalski on 2015-09-24: addressing @dosaboy comments
96. By Jorge Niedbalski on 2015-09-24: addressing comments
97. By Jorge Niedbalski on 2015-09-28: Addressed @beisner comments
98. By Jorge Niedbalski on 2015-09-28: Addressed @beisner comments