Merge lp://qastaging/~springfield-team/charms/precise/nova-compute/trunk into lp://qastaging/~openstack-charmers-archive/charms/precise/nova-compute/trunk
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~springfield-team/charms/precise/nova-compute/trunk |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/precise/nova-compute/trunk |
| Diff against target: |
232 lines (+120/-2) 7 files modified
hooks/charmhelpers/contrib/openstack/context.py (+20/-0) hooks/charmhelpers/contrib/openstack/neutron.py (+29/-0) hooks/nova_compute_hooks.py (+5/-1) hooks/nova_compute_utils.py (+10/-1) templates/grizzly/nova.conf (+6/-0) templates/havana/cisco_plugins.ini (+45/-0) templates/havana/nova.conf (+5/-0) |
| To merge this branch: | bzr merge lp://qastaging/~springfield-team/charms/precise/nova-compute/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Needs Fixing | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2014-04-28.
This proposal has been superseded by a proposal from 2014-06-25.
Description of the change
On a compute node, Cisco N1KV virtual switch is one of the choices to provide L2 switching service for VMs.
This proposal is for facilitating the integration of N1KV on a compute node
Most of the changes are going in par with nvp and ovs serving an additional choice of L2 swtiches
| ChingWei Chang (cwchang) wrote | # |
| Shiv Prasad Rao (shivrao) wrote | # |
Unmerged revisions
- 70. By Dulanjalie Ganegedara
-
adding charmhelper support to use --keyserver option for public PPA
- 69. By Shiv Prasad Rao
-
Security Groups support for N1kv
- 68. By Shiv Prasad Rao
-
fix for intermittent cloud-compute hook failure
- 67. By Shiv Prasad Rao
-
Upstream revision 71
- 66. By Shiv Prasad Rao
-
Change to stop nova-compute service when plugin is n1kv untill vem charm is not installed. nova-compute service to be enabled by the vem charm
- 65. By Shiv Prasad Rao
-
[niedbalski] Force use of http for key imports
- 64. By Shiv Prasad Rao
-
Cisco N1KV changes for ICehouse
- 63. By Shiv Prasad Rao
-
[yolanda.
robla,james- page,hazmat, ivoks,coreycb, 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 PostgreSQLMerged branch lp:~openstack-charmers/charms/precise/nova-compute/icehouse
- 62. By ChingWei Chang
-
revert repo to 60, need to retain the class since the nova-compute node also needs to be aware of it's pluggin info
- 61. By ChingWei Chang
-
1. took out cisco_plugin.ini 2. Took out n1kv plugin logic
We have merged with Icehouse logic that merged into Charm Store with this proposal.