Merge lp://qastaging/~springfield-team/charms/precise/nova-cloud-controller/trunk into lp://qastaging/~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~springfield-team/charms/precise/nova-cloud-controller/trunk |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk |
| Diff against target: |
388 lines (+252/-1) 10 files modified
config.yaml (+20/-0) hooks/charmhelpers/contrib/openstack/context.py (+20/-0) hooks/charmhelpers/contrib/openstack/neutron.py (+28/-0) hooks/nova_cc_context.py (+6/-0) hooks/nova_cc_hooks.py (+6/-0) hooks/nova_cc_utils.py (+5/-0) templates/havana/cisco_plugins.ini (+139/-0) templates/havana/neutron.conf (+6/-0) templates/havana/openrc (+15/-0) templates/icehouse/neutron.conf (+7/-1) |
| To merge this branch: | bzr merge lp://qastaging/~springfield-team/charms/precise/nova-cloud-controller/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Ceppi (community) | Abstain | ||
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-05-02.
Description of the change
This merge proposal is prepared to enable N1KV plugin to install with charm logic for nova-cloud-
Similar to ovs and nvp, n1kv (Nexus 1000V) is another layer 2 virtual switch provided by Cisco Nexus 1000V engineering team, which is a host side VM switching fabric building block we call it VEM (Virtual Ethernet Switch). 1+ VEM work in tandem with a VSM (Virtual Switch Module) to form a virtual chassis in a data center.
Please also refer to the VEM/VSM charm and Cisco Nexus1000V related document for its detail.
config.yaml
- added n1kv as a possible value for quantum-plugin
- added n1kv-vsm-username, n1kv-vsm-password, n1kv-vsm-ip to communicate with its supervisor module with (VSM)
hooks/charmhelp
- Added n1kv related dictionary for context look-up
hooks/charmhelp
- Added n1kv related plugin logic data formation
hooks/nova_
- Added copy logic to copy Cisco n1kv template to /root
templates/
- New file for Cisco Plugin related parameters
templates/
- Added customized system parameters for N1KV plugin to run with
Unmerged revisions
- 85. By Dulanjalie Ganegedara
-
adding charmhelper support to use --keyserver option for public PPA
- 84. By Shiv Prasad Rao
-
Security Groups support for N1kv
- 83. By Shiv Prasad Rao
-
security group api change for n1kv
- 82. By Shiv Prasad Rao
-
creating seperate n1kv_user_
config_ flags context variable for n1kv - 81. By Shiv Prasad Rao
-
Changes for supporting secuirty groups with N1KV
- 80. By Shiv Prasad Rao
-
n1kv-config-flags parameter added to add key=value configs to cisco_plugins.ini
- 79. By Shiv Prasad Rao
-
Adding configurable option for n1kv_restrict_
policy_ profiles - 78. By Shiv Prasad Rao
-
Adding support for PostgreSQL for cisco_plugin.ini
- 77. By Shiv Prasad Rao
-
Cisco N1KV changes
- 76. By Shiv Prasad Rao
-
[niedbalski] fixup unit tests for key management
[niedbalski] Force use of http for key imports
Leaving for openstack-charmers, thanks!