Merge lp://qastaging/~springfield-team/charms/trusty/quantum-gateway/n1kv into lp://qastaging/~openstack-charmers/charms/trusty/quantum-gateway/next
Status: | Merged |
---|---|
Merged at revision: | 74 |
Proposed branch: | lp://qastaging/~springfield-team/charms/trusty/quantum-gateway/n1kv |
Merge into: | lp://qastaging/~openstack-charmers/charms/trusty/quantum-gateway/next |
Diff against target: |
278 lines (+92/-8) 7 files modified
config.yaml (+7/-0) hooks/quantum_contexts.py (+8/-1) hooks/quantum_hooks.py (+16/-0) hooks/quantum_utils.py (+36/-2) templates/havana/dhcp_agent.ini (+11/-1) templates/havana/l3_agent.ini (+8/-1) unit_tests/test_quantum_contexts.py (+6/-3) |
To merge this branch: | bzr merge lp://qastaging/~springfield-team/charms/trusty/quantum-gateway/n1kv |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
Shiv Prasad Rao (community) | Needs Resubmitting | ||
Hua Zhang (community) | Approve | ||
Jorge Niedbalski (community) | Approve | ||
Edward Hope-Morley | Pending | ||
OpenStack Charmers | Pending | ||
Review via email: mp+231648@code.qastaging.launchpad.net |
Description of the change
config.yaml
plugin: new value 'n1kv' to facilitate n1kv specific logic in the charm code
l3-agent: use Linux router for L3 routing service on gateway for N1KV deployment networking.
hooks/quantum_
- N1KV python plugin code location and corresponding look-up strings
hooks/quantum_
- N1KV related logic for start/stop neutron-l3-agent
- Error handling like the rest of L2 switch does
hooks/quantum_
- N1KV context in par with NVP and OVS
- software packages for Quantum gateway with N1KV plugin
templates/
- Cisco N1KV plugin related parameters. We use generic one across nova-compute and quantum-gateway
templates/
- Cisco N1KV plugin dnsmasq specific parameters
templates/
- Cisco N1KV router specific parameters
Please have a look at the old merge proposal for context:
https:/
I reviewed this changes, and looks good to me. All the tests are passing and no lint
errors have been found.
LGTM +1