Juju Charms Collection
nova-cloud-controller package

Merge lp://qastaging/~springfield-team/charms/precise/nova-cloud-controller/trunk into lp://qastaging/~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk

Precise Pangolin (12.04)
trunk
Merge into trunk

Proposed by Shiv Prasad Rao on 2014-05-02

Status:	Rejected
Rejected by:	James Page on 2015-03-31
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:	673 lines (+490/-3) (has conflicts) 13 files modified config.yaml (+41/-0) hooks/charmhelpers/contrib/openstack/context.py (+25/-0) hooks/charmhelpers/contrib/openstack/neutron.py (+31/-0) hooks/charmhelpers/contrib/openstack/utils.py (+2/-2) hooks/nova_cc_context.py (+6/-0) hooks/nova_cc_hooks.py (+8/-1) 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 (+6/-0) templates/icehouse/nova.conf (+9/-0) Text conflict in config.yaml Text conflict in hooks/charmhelpers/contrib/openstack/neutron.py
To merge this branch:	bzr merge lp://qastaging/~springfield-team/charms/precise/nova-cloud-controller/trunk
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
James Page	2014-05-02	Needs Fixing on 2014-05-13
Marco Ceppi	2014-05-02	Pending
Csaba TOTH	2014-05-02	Pending
Review via email: mp+218172@code.qastaging.launchpad.net

This proposal supersedes 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-controller.
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/charmhelpers/contrib/openstack/context.py
- Added n1kv related dictionary for context look-up

hooks/charmhelpers/contrib/openstack/neutron.py
- Added n1kv related plugin logic data formation

hooks/nova_cc_hooks.py
- Added copy logic to copy Cisco n1kv template to /root

templates/havana/cisco_plugins.ini
- New file for Cisco Plugin related parameters

templates/havana/neutron.conf
- Added customized system parameters for N1KV plugin to run with

templates/havana/cisco_plugin.ini
- Adding support for PostgreSQL for cisco_plugin.ini

Revision history for this message

Marco Ceppi (marcoceppi) wrote on 2014-04-30: Posted in a previous version of this proposal

Leaving for openstack-charmers, thanks!

review: Abstain

Revision history for this message

ChingWei Chang (cwchang) wrote on 2014-05-02: Posted in a previous version of this proposal

We have merged with latest Icehouse content which went to charm store first

Revision history for this message

Csaba TOTH (tsabi) wrote on 2014-05-02: Posted in a previous version of this proposal

On line 320 the mysql is hardcoded. As this charm should support PostgreSQL too i think this is wrongly coded.

review: Needs Fixing

Revision history for this message

Shiv Prasad Rao (shivrao) wrote on 2014-05-02:

Made change to add support for postgresql

Thanks for the review.

Revision history for this message

James Page (james-page) wrote on 2014-05-13:

OK _ so I'd like to review the entire springfield charm set from an overall implementation perspective as well but with regards this merge proposal specifically:

1) /root/openrc and associated config.yaml changes

I really don't like this; the nova-cloud-controller gets related to keystone, which give it a username and password so providing it with one external seems just plain wrong;

I *think* this is used by the vxlan-gateway charm to upload its image to glance - but I think we need to review this approach to getting images into glance; this may be better addressed using a helper installed by package (maybe in the vxgw package from the springfield PPA) that gets run from outside the charms, rather than trying todo this from within the charms themselves.

2) Scope of impact on nova-cloud-controller

I think that the change we really need here is the configuration files and support for the nv1k plugin, as for NVP/NSX.

3) charmhelpers first

the changes in hooks/charmhelpers/contrib/ need to be proposed against lp:charm-helpers before landing changes into nova-cloud-controller charm.

review: Needs Fixing

lp://qastaging/~springfield-team/charms/precise/nova-cloud-controller/trunk updated on 2014-08-01

79. By Shiv Prasad Rao on 2014-06-02: Adding configurable option for n1kv_restrict_policy_profiles
80. By Shiv Prasad Rao on 2014-06-25: n1kv-config-flags parameter added to add key=value configs to cisco_plugins.ini
81. By Shiv Prasad Rao on 2014-06-30: Changes for supporting secuirty groups with N1KV
82. By Shiv Prasad Rao on 2014-07-03: creating seperate n1kv_user_config_flags context variable for n1kv
83. By Shiv Prasad Rao on 2014-07-19: security group api change for n1kv
84. By Shiv Prasad Rao on 2014-07-23: Security Groups support for N1kv
85. By Dulanjalie Ganegedara on 2014-08-01: adding charmhelper support to use --keyserver option for public PPA

Revision history for this message

Shiv Prasad Rao (shivrao) wrote on 2014-09-25:

Please ignore this merge request. I have submitted a new one here:
https://code.launchpad.net/~springfield-team/charms/trusty/nova-cloud-controller/next/+merge/235182

I can delete this if this causes confusion. (I have kept it for context)

Unmerged revisions

85. By Dulanjalie Ganegedara on 2014-08-01: adding charmhelper support to use --keyserver option for public PPA
84. By Shiv Prasad Rao on 2014-07-23: Security Groups support for N1kv
83. By Shiv Prasad Rao on 2014-07-19: security group api change for n1kv
82. By Shiv Prasad Rao on 2014-07-03: creating seperate n1kv_user_config_flags context variable for n1kv
81. By Shiv Prasad Rao on 2014-06-30: Changes for supporting secuirty groups with N1KV
80. By Shiv Prasad Rao on 2014-06-25: n1kv-config-flags parameter added to add key=value configs to cisco_plugins.ini
79. By Shiv Prasad Rao on 2014-06-02: Adding configurable option for n1kv_restrict_policy_profiles
78. By Shiv Prasad Rao on 2014-05-02: Adding support for PostgreSQL for cisco_plugin.ini
77. By Shiv Prasad Rao on 2014-05-02: Cisco N1KV changes
76. By Shiv Prasad Rao on 2014-05-02: [niedbalski] fixup unit tests for key management
[niedbalski] Force use of http for key imports