Merge lp://staging/~james-page/charms/trusty/neutron-api/kilo-dvr into lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Proposed by
James Page
Status: | Merged |
---|---|
Merged at revision: | 112 |
Proposed branch: | lp://staging/~james-page/charms/trusty/neutron-api/kilo-dvr |
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next |
Diff against target: |
171 lines (+47/-28) 5 files modified
config.yaml (+3/-2) hooks/neutron_api_context.py (+16/-12) templates/icehouse/ml2_conf.ini (+2/-2) templates/kilo/ml2_conf.ini (+2/-2) unit_tests/test_neutron_api_context.py (+24/-10) |
To merge this branch: | bzr merge lp://staging/~james-page/charms/trusty/neutron-api/kilo-dvr |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+258370@code.staging.launchpad.net |
Description of the change
Adds:
a) gre, vxlan and vlan with DVR on Kilo
b) support for multiple overlay network types
To post a comment you must log in.
charm_lint_check #4408 neutron-api-next for james-page mp258370
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/4408/