Charm Helpers

Merge lp:~james-page/charm-helpers/neutron-packages into lp:charm-helpers

  1. neutron-packages
  2. Merge into devel
Proposed by James Page
Status: Merged
Merged at revision: 131
Proposed branch: lp:~james-page/charm-helpers/neutron-packages
Merge into: lp:charm-helpers
Diff against target: 12 lines (+1/-1)
1 file modified
charmhelpers/contrib/openstack/neutron.py (+1/-1)
To merge this branch: bzr merge lp:~james-page/charm-helpers/neutron-packages
Reviewer Review Type Date Requested Status
Marco Ceppi Approve
Review via email: mp+198518@code.launchpad.net

Description of the change

Neutron based installs where still using the transitional package for the
openvswitch plugin agent; this breaks with icehouse where the tranistional
package no longer exists.

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/neutron.py'
2--- charmhelpers/contrib/openstack/neutron.py 2013-10-16 10:45:22 +0000
3+++ charmhelpers/contrib/openstack/neutron.py 2013-12-11 09:14:23 +0000
4@@ -69,7 +69,7 @@
5 relation_prefix='neutron')],
6 'services': ['neutron-plugin-openvswitch-agent'],
7 'packages': [[headers_package(), 'openvswitch-datapath-dkms'],
8- ['quantum-plugin-openvswitch-agent']],
9+ ['neutron-plugin-openvswitch-agent']],
10 'server_packages': ['neutron-server',
11 'neutron-plugin-openvswitch'],
12 'server_services': ['neutron-server']

Subscribers

People subscribed via source and target branches