Merge lp://qastaging/~hopem/charms/trusty/ceph/lp1523871 into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/next
- Trusty Tahr (14.04)
- lp1523871
- Merge into next
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 140 | ||||
Proposed branch: | lp://qastaging/~hopem/charms/trusty/ceph/lp1523871 | ||||
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/next | ||||
Diff against target: |
204 lines (+69/-14) 3 files modified
config.yaml (+6/-0) hooks/ceph_hooks.py (+20/-9) hooks/utils.py (+43/-5) |
||||
To merge this branch: | bzr merge lp://qastaging/~hopem/charms/trusty/ceph/lp1523871 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
OpenStack Charmers | Pending | ||
Review via email: mp+286487@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2016-02-03.
Commit message
Description of the change
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal | # |
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal | # |
charm_lint_check #138 ceph-next for hopem mp284936
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal | # |
charm_amulet_test #10 ceph-next for hopem mp284936
AMULET OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal | # |
charm_unit_test #141 ceph-next for hopem mp284936
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal | # |
charm_lint_check #152 ceph-next for hopem mp284936
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal | # |
charm_amulet_test #88 ceph-next for hopem mp284936
AMULET OK: passed
James Page (james-page) wrote : Posted in a previous version of this proposal | # |
Please refactor to remove the code dupe on what should be get_public_addr.
James Page (james-page) : Posted in a previous version of this proposal | # |
Edward Hope-Morley (hopem) wrote : Posted in a previous version of this proposal | # |
fixed review issues.
- 133. By Edward Hope-Morley
-
post-review fixes
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #827 ceph-next for hopem mp286487
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #732 ceph-next for hopem mp286487
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #330 ceph-next for hopem mp286487
AMULET OK: passed
- 134. By Edward Hope-Morley
-
restore sanity
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #752 ceph-next for hopem mp286487
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #849 ceph-next for hopem mp286487
LINT OK: passed
- 135. By Edward Hope-Morley
-
more
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #345 ceph-next for hopem mp286487
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #753 ceph-next for hopem mp286487
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #850 ceph-next for hopem mp286487
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #347 ceph-next for hopem mp286487
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #348 ceph-next for hopem mp286487
AMULET OK: passed
- 136. By Edward Hope-Morley
-
fixup
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #1008 ceph-next for hopem mp286487
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #1172 ceph-next for hopem mp286487
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #454 ceph-next for hopem mp286487
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://
Build: http://
- 137. By Edward Hope-Morley
-
only use fallback for get_public_addr() if networks not provided in config
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #1379 ceph-next for hopem mp286487
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #1138 ceph-next for hopem mp286487
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #491 ceph-next for hopem mp286487
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://
Build: http://
Ryan Beisner (1chb1n) wrote : | # |
#recheck
Ryan Beisner (1chb1n) wrote : | # |
Tests on this MP are hitting an issue which is resolved in /next. A rebase should give known-good tests against the proposal.
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #1224 ceph-next for hopem mp286487
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #1469 ceph-next for hopem mp286487
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #524 ceph-next for hopem mp286487
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://
Build: http://
- 138. By Edward Hope-Morley
-
sync /next
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #1472 ceph-next for hopem mp286487
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #1226 ceph-next for hopem mp286487
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #528 ceph-next for hopem mp286487
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://
Build: http://
James Page (james-page) wrote : | # |
#recheck
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #1231 ceph-next for hopem mp286487
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #1477 ceph-next for hopem mp286487
LINT OK: passed
James Page (james-page) wrote : | # |
This LGTM - please land once amulet tests have passed.
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #532 ceph-next for hopem mp286487
AMULET OK: passed
charm_unit_test #117 ceph-next for hopem mp284936
UNIT OK: passed
Build: http:// 10.245. 162.36: 8080/job/ charm_unit_ test/117/