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

Proposed by Bilal Baqar
Status: Needs review
Proposed branch: lp:~bbaqar/charms/trusty/neutron-api/neutron-api-next
Merge into: lp:~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 22 lines (+3/-0)
2 files modified
config.yaml (+1/-0)
hooks/charmhelpers/contrib/openstack/neutron.py (+2/-0)
To merge this branch: bzr merge lp:~bbaqar/charms/trusty/neutron-api/neutron-api-next
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+287385@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

Adding plumgrid in config defination

182. By Bilal Baqar

Change liberty driver for PLUMgrid

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2016-02-20 02:27:40 +0000
3+++ config.yaml 2016-02-27 11:39:01 +0000
4@@ -102,6 +102,7 @@
5 nsx - VMWare NSX
6 Calico - Project Calico Networking
7 midonet - MidoNet
8+ plumgrid - PLUMgrid
9 .
10 overlay-network-type:
11 default: gre
12
13=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
14--- hooks/charmhelpers/contrib/openstack/neutron.py 2016-02-18 14:12:39 +0000
15+++ hooks/charmhelpers/contrib/openstack/neutron.py 2016-02-27 11:39:01 +0000
16@@ -243,6 +243,8 @@
17 'python-neutron-plugin-midonet')
18 plugins['midonet']['server_packages'].append(
19 'python-networking-midonet')
20+ plugins['plumgrid']['driver'] = (
21+ 'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2')
22 return plugins
23
24

Subscribers

People subscribed via source and target branches