Merge lp://staging/~robert-ayres/charms/trusty/neutron-api/quotadriver into lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next

Proposed by Robert Ayres
Status: Merged
Merged at revision: 151
Proposed branch: lp://staging/~robert-ayres/charms/trusty/neutron-api/quotadriver
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 113 lines (+24/-0)
6 files modified
hooks/neutron_api_context.py (+4/-0)
templates/icehouse/neutron.conf (+4/-0)
templates/juno/neutron.conf (+4/-0)
templates/kilo/neutron.conf (+4/-0)
templates/liberty/neutron.conf (+4/-0)
unit_tests/test_neutron_api_context.py (+4/-0)
To merge this branch: bzr merge lp://staging/~robert-ayres/charms/trusty/neutron-api/quotadriver
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+273763@code.staging.launchpad.net

Description of the change

Support quota-driver attribute in neutron-plugin-api-subordinate relation.

Contrail charms need to set their own quota driver.

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

charm_lint_check #11502 neutron-api-next for robert-ayres mp273763
    LINT OK: passed

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

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

charm_unit_test #10694 neutron-api-next for robert-ayres mp273763
    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/12709800/
Build: http://10.245.162.77:8080/job/charm_unit_test/10694/

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

charm_amulet_test #7205 neutron-api-next for robert-ayres mp273763
    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/12710457/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7205/

151. By Robert Ayres

Fix quota driver unit tests

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

charm_lint_check #11506 neutron-api-next for robert-ayres mp273763
    LINT OK: passed

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

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

charm_unit_test #10697 neutron-api-next for robert-ayres mp273763
    UNIT OK: passed

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

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

charm_amulet_test #7209 neutron-api-next for robert-ayres mp273763
    AMULET OK: passed

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

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

Approved

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