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

[James Page]

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

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2016-02-09 10:38:19 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2016-02-18 15:22:12 +0000
@@ -237,14 +237,12 @@
         plugins['midonet']['driver'] = (
             'neutron.plugins.midonet.plugin.MidonetPluginV2')
     if release >= 'liberty':
-        midonet_origin = config('midonet-origin')
-        if midonet_origin is not None and midonet_origin[4:5] == '1':
-            plugins['midonet']['driver'] = (
-                'midonet.neutron.plugin_v1.MidonetPluginV2')
-            plugins['midonet']['server_packages'].remove(
-                'python-neutron-plugin-midonet')
-            plugins['midonet']['server_packages'].append(
-                'python-networking-midonet')
+        plugins['midonet']['driver'] = (
+            'midonet.neutron.plugin_v1.MidonetPluginV2')
+        plugins['midonet']['server_packages'].remove(
+            'python-neutron-plugin-midonet')
+        plugins['midonet']['server_packages'].append(
+            'python-networking-midonet')
     return plugins