Merge lp://qastaging/~springfield-team/charms/trusty/nova-cloud-controller/next into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~springfield-team/charms/trusty/nova-cloud-controller/next |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next |
| Diff against target: |
512 lines (+407/-2) 10 files modified
config.yaml (+22/-0) hooks/charmhelpers/contrib/openstack/context.py (+6/-2) hooks/nova_cc_hooks.py (+3/-0) hooks/nova_cc_utils.py (+5/-0) templates/havana/cisco_plugins.ini (+157/-0) templates/havana/neutron.conf (+6/-0) templates/havana/openrc (+15/-0) templates/icehouse/cisco_plugins.ini (+179/-0) templates/icehouse/neutron.conf (+5/-0) templates/icehouse/nova.conf (+9/-0) |
| To merge this branch: | bzr merge lp://qastaging/~springfield-team/charms/trusty/nova-cloud-controller/next |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Hua Zhang (community) | Needs Fixing | ||
| Jorge Niedbalski | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-09-18.
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
templates/
- Adding support for PostgreSQL for cisco_plugin.ini
Please refer to old merge proposal if needed:
https:/
| Shiv Prasad Rao (shivrao) wrote | # |
| Shiv Prasad Rao (shivrao) wrote | # |
Unmerged revisions
- 108. By Shiv Prasad Rao
-
Addressing review comments
1. Added delimiter for cisco options in config.yaml
2. Removed cisco_plugins.ini for havana. Added conditional block in icehouse template - 107. By Shiv Prasad Rao
-
typo
- 106. By Shiv Prasad Rao
-
Sync with revision 112
- 105. By Shiv Prasad Rao
-
Addressed Review comments:
1.Removed openrc generation
2.Trimmed down comments from cisco_plugins.ini - 104. By Shiv Prasad Rao
-
Fixing a typo
- 103. By Shiv Prasad Rao
-
Upstream 102
- 102. By Shiv Prasad Rao
-
Addressing review comments
- 101. By Shiv Prasad Rao
-
Adding support for Cisco N1kV
I have submitted changes required for charm-helpers as part of another commit to lp:charm-helpers
https:/