Merge lp://qastaging/~springfield-team/charms/precise/quantum-gateway/trunk into lp://qastaging/~charmers/charms/precise/quantum-gateway/trunk
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~springfield-team/charms/precise/quantum-gateway/trunk |
| Merge into: | lp://qastaging/~charmers/charms/precise/quantum-gateway/trunk |
| Diff against target: |
1565 lines (+643/-109) 27 files modified
README.md (+38/-1) config.yaml (+21/-1) hooks/charmhelpers/contrib/hahelpers/cluster.py (+4/-4) hooks/charmhelpers/contrib/openstack/context.py (+109/-31) hooks/charmhelpers/contrib/openstack/neutron.py (+28/-4) hooks/charmhelpers/contrib/openstack/utils.py (+31/-20) hooks/charmhelpers/contrib/storage/linux/ceph.py (+6/-2) hooks/charmhelpers/contrib/storage/linux/utils.py (+2/-1) hooks/charmhelpers/core/hookenv.py (+6/-0) hooks/charmhelpers/core/host.py (+53/-3) hooks/charmhelpers/fetch/__init__.py (+65/-14) hooks/charmhelpers/fetch/archiveurl.py (+15/-0) hooks/quantum_contexts.py (+32/-6) hooks/quantum_hooks.py (+14/-0) hooks/quantum_utils.py (+70/-11) revision (+1/-1) templates/folsom/metadata_agent.ini (+1/-1) templates/folsom/nova.conf (+1/-0) templates/folsom/quantum.conf (+1/-0) templates/havana/cisco_plugins.ini (+44/-0) templates/havana/dhcp_agent.ini (+21/-3) templates/havana/dnsmasq.conf (+3/-0) templates/havana/l3_agent.ini (+10/-1) templates/havana/neutron.conf (+1/-0) templates/havana/nova.conf (+1/-0) unit_tests/test_quantum_contexts.py (+52/-5) unit_tests/test_quantum_utils.py (+13/-0) |
| To merge this branch: | bzr merge lp://qastaging/~springfield-team/charms/precise/quantum-gateway/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-04-29.
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
| ChingWei Chang (cwchang) wrote | # |
Unmerged revisions
- 54. By Dulanjalie Ganegedara
-
adding charmhelper support to use --keyserver option for public PPA
- 53. By Shiv Prasad Rao
-
Upstream revision 50
- 52. By Shiv Prasad Rao
-
Removing < havana changes for N1kV
- 51. By Shiv Prasad Rao
-
[niedbalski] Force use of http for key imports
- 50. By Shiv Prasad Rao
-
l3-agent config parameter changed to boolean
- 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 - 48. By Shiv Prasad Rao
-
Making changes for use_syslog parameter for Cisco n1kv
- 47. By Shiv Prasad Rao
-
Adding Support for Cisco Nexus 1000v
- 46. By Edward Hope-Morley
-
[hopem] Added support for logging to syslog
- 45. By James Page
-
[gnuoy,
r=james- page,t= james-page] Add support for specifying external port by mac address Also resync charm-helpers
Correction on comment #1
The source branch is at :
lp:~springfield-team/charms/precise/quantum-gateway/trunk