Juju Charms Collection
quantum-gateway package

Merge lp://qastaging/~springfield-team/charms/precise/quantum-gateway/trunk into lp://qastaging/~openstack-charmers/charms/trusty/quantum-gateway/next

  1. Precise Pangolin (12.04)
  2. trunk
  3. Merge into next
Proposed by James Page
Status: Rejected
Rejected by: James Page
Proposed branch: lp://qastaging/~springfield-team/charms/precise/quantum-gateway/trunk
Merge into: lp://qastaging/~openstack-charmers/charms/trusty/quantum-gateway/next
Diff against target: 398 lines (+193/-20) (has conflicts)
9 files modified
config.yaml (+12/-1)
hooks/charmhelpers/contrib/openstack/utils.py (+2/-2)
hooks/quantum_contexts.py (+27/-6)
hooks/quantum_hooks.py (+23/-3)
hooks/quantum_utils.py (+58/-6)
templates/havana/cisco_plugins.ini (+44/-0)
templates/havana/dhcp_agent.ini (+12/-1)
templates/havana/l3_agent.ini (+10/-1)
unit_tests/test_quantum_utils.py (+5/-0)
Text conflict in config.yaml
Text conflict in hooks/quantum_contexts.py
Text conflict in hooks/quantum_hooks.py
Text conflict in hooks/quantum_utils.py
Text conflict in unit_tests/test_quantum_utils.py
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
Jorge Niedbalski Pending
Review via email: mp+227723@code.qastaging.launchpad.net

This proposal supersedes 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 : 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 : 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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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
Revision history for this message
Shiv Prasad Rao (shivrao) wrote : Posted in a previous version of this proposal

1) Removed < havana changes
2) Charmhelper changes have been synced with lp:charm-helpers. So charmhelper changes with this merge can be ignored.

Revision history for this message
Jorge Niedbalski (niedbalski) wrote : Posted in a previous version of this proposal

This change LGTM +1.

review: Approve
Revision history for this message
James Page (james-page) wrote :

Apologies, looks like a few changes landed into next and this branch needs re-basing again...

review: Needs Fixing
lp://qastaging/~springfield-team/charms/precise/quantum-gateway/trunk updated
54. By Dulanjalie Ganegedara

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

Revision history for this message
Shiv Prasad Rao (shivrao) wrote :

Please ignore this merge request. I have submitted a new one here using the /next branch:
https://code.launchpad.net/~springfield-team/charms/trusty/quantum-gateway/next/+merge/231648

Please let me know if you would like me to delete this. I have kept this one for reference.

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