Juju Charms Collection
quantum-gateway package

Merge lp://qastaging/~springfield-team/charms/precise/quantum-gateway/trunk into lp://qastaging/charms/quantum-gateway

Precise Pangolin (12.04)
trunk
Merge into trunk

Proposed by ChingWei Chang on 2014-05-02

Status:	Superseded
Proposed branch:	lp://qastaging/~springfield-team/charms/precise/quantum-gateway/trunk
Merge into:	lp://qastaging/charms/quantum-gateway
Diff against target:	306 lines (+134/-5) 7 files modified config.yaml (+7/-0) hooks/quantum_contexts.py (+8/-1) hooks/quantum_hooks.py (+14/-0) hooks/quantum_utils.py (+39/-2) templates/havana/cisco_plugins.ini (+44/-0) templates/havana/dhcp_agent.ini (+12/-1) templates/havana/l3_agent.ini (+10/-1)
To merge this branch:	bzr merge lp://qastaging/~springfield-team/charms/precise/quantum-gateway/trunk
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Jorge Niedbalski (community)		Approve on 2014-07-15
James Page	2014-05-02	Needs Information on 2014-05-11
Review via email: mp+218169@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-04-29.

This proposal has been superseded by a proposal from 2014-07-22.

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_contexts.py
- N1KV python plugin code location and corresponding look-up strings

hooks/quantum_hooks.py:
- N1KV related logic for start/stop neutron-l3-agent
- Error handling like the rest of L2 switch does

hooks/quantum_utils.py
- N1KV context in par with NVP and OVS
- software packages for Quantum gateway with N1KV plugin

templates/havana/cisco_plugins.ini
- Cisco N1KV plugin related parameters. We use generic one across nova-compute and quantum-gateway

templates/havana/dhcp_agent.ini
- Cisco N1KV plugin dnsmasq specific parameters

templates/havana/l3_agent.ini
- Cisco N1KV router specific parameters

Revision history for this message

ChingWei Chang (cwchang) wrote on 2014-04-28: Posted in a previous version of this proposal

Correction on comment #1

The source branch is at :
lp:~springfield-team/charms/precise/quantum-gateway/trunk

Revision history for this message

James Page (james-page) wrote on 2014-04-29: Posted in a previous version of this proposal

Re-targetted to the correct branch; needs some re-basing and updates based on the features/changes that landed a few weeks ago to support icehouse.

Generally looks ok - please rebase.

One fix required:

+ l3-agent:
26 + type: string
27 + default: enable
28 + description: |
29 + Optional configuration to support use of linux router
30 + Note that this is used only for Cisco n1kv plugin.

This is a boolean - please make it one! you can then use "config('l3-agent') is True". A better name would be 'enable-l3-agent'.

review: Needs Fixing

Revision history for this message

ChingWei Chang (cwchang) wrote on 2014-04-29: Posted in a previous version of this proposal

James,
Our development model is like the following:

charm trunk/... quantuam gateway
+
|-> springfield-team --> quantum gateway

Springfield-team branch is our development branch.

The question is:
How do I rebase the development branch springfield-team to later charm store revion ? I don't see any command or Launchpad knob to provide that function

ChingWei

Revision history for this message

ChingWei Chang (cwchang) wrote on 2014-05-02:

James,
We have made the l3-agent naming change also merged with the latest Charm Store tips.
Please re-review it, Thanks !
ChingWei

Revision history for this message

James Page (james-page) wrote on 2014-05-11:

Apologies for not asking this question earlier, but which openstack versions does this plugin support? if its only havana and above, we should not add updates for QUANTUM_* as its not supported; but leaving this out if someone tries to use the features with < havana, the charm will error out rather than doing something undefined and untested.

review: Needs Information

lp://qastaging/~springfield-team/charms/precise/quantum-gateway/trunk updated on 2014-06-25