Merge lp://qastaging/~gnuoy/charms/trusty/keystone/lp1506397 into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next

Proposed by Liam Young
Status: Merged
Merged at revision: 189
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/keystone/lp1506397
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 165 lines (+29/-16)
5 files modified
actions/openstack_upgrade.py (+2/-2)
hooks/keystone_hooks.py (+10/-3)
hooks/keystone_utils.py (+6/-1)
unit_tests/test_actions_openstack_upgrade.py (+7/-6)
unit_tests/test_keystone_hooks.py (+4/-4)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/keystone/lp1506397
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+274856@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #12158 keystone-next for gnuoy mp274856
    LINT OK: passed

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

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

charm_unit_test #11289 keystone-next for gnuoy mp274856
    UNIT FAIL: unit-test failed

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

Full unit test output: http://paste.ubuntu.com/12859915/
Build: http://10.245.162.77:8080/job/charm_unit_test/11289/

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

charm_amulet_test #7428 keystone-next for gnuoy mp274856
    AMULET OK: passed

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

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

charm_lint_check #12161 keystone-next for gnuoy mp274856
    LINT OK: passed

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

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

charm_unit_test #11292 keystone-next for gnuoy mp274856
    UNIT OK: passed

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

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

charm_amulet_test #7431 keystone-next for gnuoy mp274856
    AMULET OK: passed

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

Revision history for this message
James Page (james-page) wrote :

I think this is fine as a short-term fix to get us to release; however I'd like for us to stand back as a dev team early next cycle and see how we can de-couple the codebase we're managing from the code we're using to manage it with, as I think that is where this problem arises.

Only three charms do this afaik; keystone, swift-proxy and neutron-api.

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