Merge lp://staging/~corey.bryant/charms/trusty/ceph/render into lp://staging/~openstack-charmers-archive/charms/trusty/ceph/next

Proposed by Corey Bryant
Status: Merged
Merged at revision: 94
Proposed branch: lp://staging/~corey.bryant/charms/trusty/ceph/render
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/ceph/next
Diff against target: 134 lines (+52/-23)
4 files modified
hooks/charmhelpers/contrib/storage/linux/ceph.py (+43/-0)
hooks/charmhelpers/core/host.py (+7/-4)
hooks/hooks.py (+2/-3)
hooks/utils.py (+0/-16)
To merge this branch: bzr merge lp://staging/~corey.bryant/charms/trusty/ceph/render
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+244796@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Corey Bryant (corey.bryant) wrote :

This is just simplifying the code and using render() from charm-helpers instead of the roll-your-own render_template().

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #217 ceph-next for corey.bryant mp244796
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #184 ceph-next for corey.bryant mp244796
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #237 ceph-next for corey.bryant mp244796
    AMULET FAIL: amulet-test failed

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

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

Revision history for this message
Corey Bryant (corey.bryant) wrote :

> charm_amulet_test #237 ceph-next for corey.bryant mp244796
> AMULET FAIL: amulet-test failed
>
> AMULET Results (max last 2 lines):
> ERROR subprocess encountered error code 1
> make: *** [test] Error 1
>
> Full amulet test output: http://paste.ubuntu.com/9535876/
> Build: http://10.245.162.77:8080/job/charm_amulet_test/237/

Deploying keystone on precise-icehouse has a known failure at the moment that shouldn't block this from being merged. Keystone is missing a python-six dependency.

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #258 ceph-next for corey.bryant mp244796
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #286 ceph-next for corey.bryant mp244796
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #304 ceph-next for corey.bryant mp244796
    AMULET FAIL: amulet-test failed

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #323 ceph-next for corey.bryant mp244796
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #295 ceph-next for corey.bryant mp244796
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #458 ceph-next for corey.bryant mp244796
    AMULET OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

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