Charm Helpers

Merge lp:~james-page/charm-helpers/fixup-midonet-liberty-nonmem into lp:charm-helpers

  1. fixup-midonet-liberty-nonmem
  2. Merge into devel
Proposed by James Page on 2016-02-18
Status: Merged
Merged at revision: 532
Proposed branch: lp:~james-page/charm-helpers/fixup-midonet-liberty-nonmem
Merge into: lp:charm-helpers
Diff against target: 22 lines (+6/-8)
1 file modified
charmhelpers/contrib/openstack/neutron.py (+6/-8)
To merge this branch: bzr merge lp:~james-page/charm-helpers/fixup-midonet-liberty-nonmem
Reviewer Review Type Date Requested Status
Charles Butler (community) 2016-02-18 Approve on 2016-02-18
Review via email: mp+286524@code.launchpad.net

Description of the Change

Ensure that correct networking package is used for liberty generally, not just for mem.

To post a comment you must log in.
Charles Butler (lazypower) wrote :

+1 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 2016-02-09 10:38:19 +0000
3+++ charmhelpers/contrib/openstack/neutron.py 2016-02-18 15:22:12 +0000
4@@ -237,14 +237,12 @@
5 plugins['midonet']['driver'] = (
6 'neutron.plugins.midonet.plugin.MidonetPluginV2')
7 if release >= 'liberty':
8- midonet_origin = config('midonet-origin')
9- if midonet_origin is not None and midonet_origin[4:5] == '1':
10- plugins['midonet']['driver'] = (
11- 'midonet.neutron.plugin_v1.MidonetPluginV2')
12- plugins['midonet']['server_packages'].remove(
13- 'python-neutron-plugin-midonet')
14- plugins['midonet']['server_packages'].append(
15- 'python-networking-midonet')
16+ plugins['midonet']['driver'] = (
17+ 'midonet.neutron.plugin_v1.MidonetPluginV2')
18+ plugins['midonet']['server_packages'].remove(
19+ 'python-neutron-plugin-midonet')
20+ plugins['midonet']['server_packages'].append(
21+ 'python-networking-midonet')
22 return plugins
23
24

Subscribers

People subscribed via source and target branches