← Back to branch summary

~celebdor/charms/trusty/neutron-api/liberty

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/neutron.py

  • Committer: Antoni Segura Puimedon
  • Date: 2016-01-26 09:38:30 UTC
  • Revision ID: toni@midokura.com-20160126093830-afhwinw6ta5b60gi
Fix liberty configuration when midonet-origins is not set

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/neutron.py
237
237
        plugins['midonet']['driver'] = (
238
238
            'neutron.plugins.midonet.plugin.MidonetPluginV2')
239
239
    if release >= 'liberty':
240
 
        if config('midonet-origin')[4:5] == '1':
 
240
        midonet_origin = config('midonet-origin')
 
241
        if midonet_origin is not None and midonet_origin[4:5] == '1':
241
242
            plugins['midonet']['driver'] = (
242
243
                'midonet.neutron.plugin_v1.MidonetPluginV2')
243
244