Charm Helpers

Merge lp:~celebdor/charm-helpers/plugin_pkg_fix into lp:charm-helpers

  1. plugin_pkg_fix
  2. Merge into devel
Proposed by Antoni Segura Puimedon
Status: Merged
Merged at revision: 528
Proposed branch: lp:~celebdor/charm-helpers/plugin_pkg_fix
Merge into: lp:charm-helpers
Diff against target: 12 lines (+4/-0)
1 file modified
charmhelpers/contrib/openstack/neutron.py (+4/-0)
To merge this branch: bzr merge lp:~celebdor/charm-helpers/plugin_pkg_fix
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+285458@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

Added a unit test during merge...

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 2016-01-25 15:00:25 +0000
3+++ charmhelpers/contrib/openstack/neutron.py 2016-02-09 10:41:44 +0000
4@@ -241,6 +241,10 @@
5 if midonet_origin is not None and midonet_origin[4:5] == '1':
6 plugins['midonet']['driver'] = (
7 'midonet.neutron.plugin_v1.MidonetPluginV2')
8+ plugins['midonet']['server_packages'].remove(
9+ 'python-neutron-plugin-midonet')
10+ plugins['midonet']['server_packages'].append(
11+ 'python-networking-midonet')
12 return plugins
13
14

Subscribers

People subscribed via source and target branches