Juju Charms Collection
nova-compute package

Merge lp://qastaging/~springfield-team/charms/precise/nova-compute/trunk into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

  1. Precise Pangolin (12.04)
  2. trunk
  3. Merge into next
Proposed by James Page
Status: Rejected
Rejected by: James Page
Proposed branch: lp://qastaging/~springfield-team/charms/precise/nova-compute/trunk
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 399 lines (+202/-7) (has conflicts)
11 files modified
charm-helpers.yaml.OTHER (+12/-0)
hooks/charmhelpers/contrib/openstack/context.py (+21/-0)
hooks/charmhelpers/contrib/openstack/neutron.py (+33/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+2/-2)
hooks/nova_compute_context.py (+20/-0)
hooks/nova_compute_hooks.py (+17/-1)
hooks/nova_compute_utils.py (+39/-3)
templates/grizzly/nova.conf (+6/-0)
templates/havana/cisco_plugins.ini (+45/-0)
templates/havana/nova.conf (+5/-0)
templates/icehouse/ml2_conf.ini (+2/-1)
Contents conflict in charm-helpers.yaml
Text conflict in hooks/charmhelpers/contrib/openstack/context.py
Text conflict in hooks/charmhelpers/contrib/openstack/neutron.py
Text conflict in hooks/nova_compute_context.py
Text conflict in hooks/nova_compute_hooks.py
Text conflict in hooks/nova_compute_utils.py
To merge this branch: bzr merge lp://qastaging/~springfield-team/charms/precise/nova-compute/trunk
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Jorge Niedbalski Pending
Review via email: mp+227725@code.qastaging.launchpad.net

This proposal supersedes 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

--
Note:
Charm-helper changes have already been synced with lp:charm-helpers. So can be ignored.

To post a comment you must log in.
Revision history for this message
ChingWei Chang (cwchang) wrote : Posted in a previous version of this proposal

We have merged with Icehouse logic that merged into Charm Store with this proposal.

Revision history for this message
James Page (james-page) wrote : Posted in a previous version of this proposal

The changes to hooks/charmhelpers need to land into lp:charm-helpers prior to merging this change otherwise they will be lost on the next re-sync.

review: Needs Fixing
Revision history for this message
James Page (james-page) wrote : Posted in a previous version of this proposal

Also does this plugin actually have an agent that need to run on hypervisors and service nodes?

If not then its likely that you don't need to install packages or do neutron configuration for this plugin.

review: Needs Fixing
Revision history for this message
Shiv Prasad Rao (shivrao) wrote : Posted in a previous version of this proposal

The n1kv plugin runs on the controller. The changes required for the cisco_plugins.ini have been upstreamed to charmhelpers.
On the compute node, the change is with the nova.conf template.

Revision history for this message
Jorge Niedbalski (niedbalski) wrote : Posted in a previous version of this proposal

This change LGTM +1.

review: Approve
lp://qastaging/~springfield-team/charms/precise/nova-compute/trunk updated
69. By Shiv Prasad Rao

Security Groups support for N1kv

Revision history for this message
James Page (james-page) wrote :

Apologies, looks like a few changes landed into next and this branch needs re-basing again...

review: Needs Fixing
lp://qastaging/~springfield-team/charms/precise/nova-compute/trunk updated
70. By Dulanjalie Ganegedara

adding charmhelper support to use --keyserver option for public PPA

Revision history for this message
Shiv Prasad Rao (shivrao) wrote :

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

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

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 PostgreSQL

Merged 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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches