openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Resync charm-helpers

Browse Source 
Change-Id: Id8eb4ea28f651f007d714d2bf406eb9796a5ab5d
This commit is contained in:
James Page
2016-03-02 11:07:46 +00:00
parent 2c3299d496
commit d5806b4ce2
9 changed files with 157 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hooks/charmhelpers/contrib/openstack/neutron.py
View File

@@ -237,14 +237,16 @@ def neutron_plugins():
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')
plugins['plumgrid']['driver'] = (
'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2')
plugins['plumgrid']['server_packages'].remove(
'neutron-plugin-plumgrid')
return plugins