Paste #484880
1 2 3 4 5 6 7 8 9 10 11 12 13 | === modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py 2016-01-22 23:48:29 +0000
+++ charmhelpers/contrib/openstack/neutron.py 2016-01-25 14:57:14 +0000
@@ -237,7 +237,8 @@
plugins['midonet']['driver'] = (
'neutron.plugins.midonet.plugin.MidonetPluginV2')
if release >= 'liberty':
- if config('midonet-origin')[4:5] == '1':
+ 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')
return plugins
|