Merge lp://qastaging/~1chb1n/charms/trusty/nova-cloud-controller/next-amulet-1602b into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 219
Proposed branch: lp://qastaging/~1chb1n/charms/trusty/nova-cloud-controller/next-amulet-1602b
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 247 lines (+74/-114)
2 files modified
tests/010-basic-precise-essex (+0/-10)
tests/basic_deployment.py (+74/-104)
To merge this branch: bzr merge lp://qastaging/~1chb1n/charms/trusty/nova-cloud-controller/next-amulet-1602b
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+286392@code.qastaging.launchpad.net

Description of the change

Update amulet test for Mitaka; Refactor conf dict checks for clarity and simplicity; Remove Essex conditionals and definition.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #753 nova-cloud-controller-next for 1chb1n mp286392
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/753/

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

charm_unit_test #659 nova-cloud-controller-next for 1chb1n mp286392
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/659/

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

charm_amulet_test #307 nova-cloud-controller-next for 1chb1n mp286392
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/307/

Revision history for this message
David Ames (thedac) wrote :

Ryan,

Checking on in line question before merging.

review: Needs Information
Revision history for this message
Ryan Beisner (1chb1n) wrote :

@thedac - Thanks for the review. Ack on the legacy_ratelimit for Mitaka and later. It's driven by the mitaka template @:

http://bazaar.launchpad.net/~openstack-charmers/charms/trusty/nova-cloud-controller/next/view/head:/templates/mitaka/api-paste.ini#L111

Revision history for this message
Ryan Beisner (1chb1n) wrote :
Revision history for this message
David Ames (thedac) wrote :

OK, looks good. Merging.

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