Juju Charms Collection
quantum-gateway package

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

  1. Precise Pangolin (12.04)
  2. trunk
  3. Merge into trunk
Proposed by James Page
Status: Superseded
Proposed branch: lp://qastaging/~springfield-team/charms/precise/quantum-gateway/trunk
Merge into: lp://qastaging/charms/quantum-gateway
Diff against target: 346 lines (+162/-7)
7 files modified
config.yaml (+7/-0)
hooks/quantum_contexts.py (+12/-2)
hooks/quantum_hooks.py (+14/-0)
hooks/quantum_utils.py (+63/-3)
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
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Review via email: mp+217601@code.qastaging.launchpad.net

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

This proposal has been superseded by a proposal from 2014-05-02.

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

To post a comment you must log in.
Revision history for this message
ChingWei Chang (cwchang) wrote : 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 :

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 :

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

lp://qastaging/~springfield-team/charms/precise/quantum-gateway/trunk updated
49. By Shiv Prasad Rao

[yolanda.robla,james-page,hazmat,r=james-page,t=*]

Support for Icehouse on 12.04 and 14.04
Support for Active/Active and SSL RabbitMQ
Support for SSL MySQL
Support for SSL endpoints
Support for PostgreSQL
--
Support for Cisco N1kv

50. By Shiv Prasad Rao

l3-agent config parameter changed to boolean

51. By Shiv Prasad Rao

[niedbalski] Force use of http for key imports

52. By Shiv Prasad Rao

Removing < havana changes for N1kV

53. By Shiv Prasad Rao

Upstream revision 50

54. By Dulanjalie Ganegedara

adding charmhelper support to use --keyserver option for public PPA

Unmerged revisions

54. By Dulanjalie Ganegedara

adding charmhelper support to use --keyserver option for public PPA

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