Merge lp://qastaging/~ddellav/charms/trusty/neutron-api/ml2-port-security into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

Proposed by David Della Vecchia
Status: Merged
Merged at revision: 156
Proposed branch: lp://qastaging/~ddellav/charms/trusty/neutron-api/ml2-port-security
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 75 lines (+14/-0)
4 files modified
config.yaml (+4/-0)
hooks/neutron_api_context.py (+2/-0)
templates/kilo/ml2_conf.ini (+4/-0)
unit_tests/test_neutron_api_context.py (+4/-0)
To merge this branch: bzr merge lp://qastaging/~ddellav/charms/trusty/neutron-api/ml2-port-security
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+276764@code.qastaging.launchpad.net

Description of the change

Adding ML2 Port Security config option and corresponding template changes.

To post a comment you must log in.
161. By David Della Vecchia

emty commit to kick off USCI

Revision history for this message
James Page (james-page) :
review: Needs Fixing
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #13368 neutron-api-next for ddellav mp276764
    LINT OK: passed

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

162. By David Della Vecchia

Fixing config description and dropping icehouse template changes

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

charm_unit_test #12505 neutron-api-next for ddellav mp276764
    UNIT OK: passed

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

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

charm_lint_check #13369 neutron-api-next for ddellav mp276764
    LINT OK: passed

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

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

charm_unit_test #12506 neutron-api-next for ddellav mp276764
    UNIT OK: passed

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

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

charm_amulet_test #7823 neutron-api-next for ddellav mp276764
    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/13209186/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7823/

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

FYI, amulet test #7823 failed due to undercloud or tooling issue. Rerunning.

http://paste.ubuntu.com/13209244/

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

charm_amulet_test #7825 neutron-api-next for ddellav mp276764
    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/13209501/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7825/

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

charm_amulet_test #7822 neutron-api-next for ddellav mp276764
    AMULET OK: passed

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

Revision history for this message
James Page (james-page) :
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