Juju Charms Collection
cinder-ceph package

Merge lp://staging/~gnuoy/charms/trusty/cinder-ceph/1453940 into lp://staging/~openstack-charmers-archive/charms/trusty/cinder-ceph/next

Trusty Tahr (14.04)
1453940
Merge into next

Proposed by Liam Young on 2015-08-27

Status:

Merged

Merged at revision:

43

Proposed branch:

lp://staging/~gnuoy/charms/trusty/cinder-ceph/1453940

Merge into:

lp://staging/~openstack-charmers-archive/charms/trusty/cinder-ceph/next

Diff against target:

1382 lines (+929/-101)

8 files modified

hooks/charmhelpers/contrib/openstack/context.py (+8/-9)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+224/-2)
hooks/cinder_hooks.py (+13/-22)
tests/basic_deployment.py (+52/-8)
tests/charmhelpers/contrib/amulet/utils.py (+234/-52)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+20/-5)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0)
unit_tests/test_cinder_hooks.py (+19/-3)

To merge this branch:

bzr merge lp://staging/~gnuoy/charms/trusty/cinder-ceph/1453940

Related bugs:

Bug #1453940: OSA run: units related to ceph got an empty ceph.conf

High

Fix Released

Remove

Link a bug report

Reviewer	Review Type	Date Requested	Status
Edward Hope-Morley		2015-08-27	Needs Fixing on 2015-09-11
Ryan Beisner (community)			Needs Fixing on 2015-09-08
Review via email: mp+269379@code.staging.launchpad.net

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-08:

#

charm_lint_check #9593 cinder-ceph-next for gnuoy mp269379
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-08:

#

charm_unit_test #8831 cinder-ceph-next for gnuoy mp269379
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-08:

#

charm_amulet_test #6316 cinder-ceph-next for gnuoy mp269379
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/12312640/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6316/

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2015-09-08:

#

FYI, amulet test failed due to https://bugs.launchpad.net/charm-helpers/+bug/1474036

Re-running...

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-08:

#

charm_amulet_test #6318 cinder-ceph-next for gnuoy mp269379
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/12314087/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6318/

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2015-09-08:

#

Sorry, ignore my prev comment. I didn't look deeply enough. It's not that race bug mentioned.

review: Needs Fixing

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2015-09-08:

#

The proposed changes appear to cause additional subordinate relation data (request-id). If this is an expected behavior change, the amulet test will need to be updated accordingly.

Here's where it tripped:

actual relation data (partial):
'broker_req': '{"api-version": 1, "request-id": "5e38da9e-5635-11e5-9a6a-fa163ee76ffe", "ops": [{"replicas": 3, "name": "cinder-ceph", "op": "create-pool"}]}'}

expected relation data (partial):
'broker_req': '{"api-version": 1, "ops": [{"replicas": 3, "name": "cinder-ceph", "op": "create-pool"}]}'}

Thanks - holler with any questions!

review: Needs Fixing

lp://staging/~gnuoy/charms/trusty/cinder-ceph/1453940 updated on 2015-09-10

45. By Liam Young on 2015-09-10: Charm helper sync

Revision history for this message

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

#

charm_lint_check #9713 cinder-ceph-next for gnuoy mp269379
LINT OK: passed

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

Revision history for this message

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

#

charm_amulet_test #6341 cinder-ceph-next for gnuoy mp269379
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/12328941/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6341/

Revision history for this message

Edward Hope-Morley (hopem) wrote on 2015-09-11:

#

LGTM +1 (think amulet fail is unrelated)

review: Approve

Revision history for this message

Edward Hope-Morley (hopem) wrote on 2015-09-11:

#

Apologies I take that back. This amulet error is real and related to the patch.

review: Needs Fixing

lp://staging/~gnuoy/charms/trusty/cinder-ceph/1453940 updated on 2015-09-12

46. By Liam Young on 2015-09-12: Fix amulet tests

Revision history for this message

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

#

charm_lint_check #9829 cinder-ceph-next for gnuoy mp269379
LINT OK: passed

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

Revision history for this message

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

#

charm_unit_test #9054 cinder-ceph-next for gnuoy mp269379
UNIT OK: passed

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

Revision history for this message

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

#

charm_amulet_test #6363 cinder-ceph-next for gnuoy mp269379
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/12364811/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6363/

Revision history for this message

Edward Hope-Morley (hopem) wrote on 2015-09-13:

#

Still getting an amulet fail...

lp://staging/~gnuoy/charms/trusty/cinder-ceph/1453940 updated on 2015-09-14

47. By Liam Young on 2015-09-14: More amulet fixes for ceph broker conversation

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-14:

#

charm_lint_check #9929 cinder-ceph-next for gnuoy mp269379
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-14:

#

charm_unit_test #9148 cinder-ceph-next for gnuoy mp269379
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-14:

#

charm_amulet_test #6413 cinder-ceph-next for gnuoy mp269379
AMULET OK: passed

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Liam Young

Nobuto Murata

OpenStack Charmers