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

[Bilal Baqar]

PLUMgrid plugin driver in neutron needs to be updated for liberty.

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

charm_lint_check #1621 neutron-api-next for bbaqar mp287385
    LINT OK: passed

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

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

charm_unit_test #1365 neutron-api-next for bbaqar mp287385
    UNIT OK: passed

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

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

charm_amulet_test #561 neutron-api-next for bbaqar mp287385
    AMULET OK: passed

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

Unmerged revisions

183. By Bilal Baqar on 2016-02-27

Adding plumgrid in config defination

182. By Bilal Baqar on 2016-02-27

Change liberty driver for PLUMgrid

=== modified file 'config.yaml'
--- config.yaml	2016-02-20 02:27:40 +0000
+++ config.yaml	2016-02-27 11:39:01 +0000
@@ -102,6 +102,7 @@
         nsx - VMWare NSX
         Calico - Project Calico Networking
         midonet - MidoNet
+        plumgrid - PLUMgrid
       .
   overlay-network-type:
     default: gre
 
=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
--- hooks/charmhelpers/contrib/openstack/neutron.py	2016-02-18 14:12:39 +0000
+++ hooks/charmhelpers/contrib/openstack/neutron.py	2016-02-27 11:39:01 +0000
@@ -243,6 +243,8 @@
             'python-neutron-plugin-midonet')
         plugins['midonet']['server_packages'].append(
             'python-networking-midonet')
+        plugins['plumgrid']['driver'] = (
+            'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2')
     return plugins