Merge lp:~celebdor/charms/trusty/neutron-api/plugin_pkg_fix into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[Antoni Segura Puimedon]

fixes bug: https://launchpad.net/bugs/1543348

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #123 neutron-api-next for celebdor mp285421
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/123/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #135 neutron-api-next for celebdor mp285421
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/135/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #22 neutron-api-next for celebdor mp285421
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 124
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15004565/
Build: http://10.245.162.36:8080/job/charm_amulet_test/22/

[Ryan Beisner (1chb1n)]

^ FYI, an undercloud network issue occurred as this test was being executed. I've retriggered.

[Antoni Segura Puimedon (celebdor)]

Thanks Ryan

Antoni Segura Puimedon

On Wed, Feb 10, 2016 at 12:49 PM, Ryan Beisner <email address hidden>
wrote:

> ^ FYI, an undercloud network issue occurred as this test was being
> executed. I've retriggered.
> --
>
> https://code.launchpad.net/~celebdor/charms/trusty/neutron-api/plugin_pkg_fix/+merge/285421
> You are the owner of lp:~celebdor/charms/trusty/neutron-api/plugin_pkg_fix.
>

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #30 neutron-api-next for celebdor mp285421
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/30/

[James Page (james-page)]

review: Approve

=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
--- hooks/charmhelpers/contrib/openstack/neutron.py	2016-01-26 09:35:40 +0000
+++ hooks/charmhelpers/contrib/openstack/neutron.py	2016-02-08 23:12:57 +0000
@@ -241,6 +241,10 @@
         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')
     return plugins