← Back to branch summary

~openstack-charmers-next/charms/xenial/swift-storage/trunk

« back to all changes in this revision

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

  • Committer: James Page
  • Date: 2016-03-03 11:50:13 UTC
  • Revision ID: james.page@ubuntu.com-20160303115013-h6ebo078dpdaf5fp
Resync charm-helpers

Resolve single unit deployment failure with default configuration;
update unit tests to ensure that mkdir is called for /srv/node.

Change-Id: Id5518a2144ec3bdc6341f6dfc85835ae342f490e

Show diffs side-by-side

added added

removed removed

Lines of Context:
charmhelpers/contrib/openstack/neutron.py
237
237
        plugins['midonet']['driver'] = (
238
238
            'neutron.plugins.midonet.plugin.MidonetPluginV2')
239
239
    if release >= 'liberty':
240
 
        midonet_origin = config('midonet-origin')
241
 
        if midonet_origin is not None and midonet_origin[4:5] == '1':
242
 
            plugins['midonet']['driver'] = (
243
 
                'midonet.neutron.plugin_v1.MidonetPluginV2')
244
 
            plugins['midonet']['server_packages'].remove(
245
 
                'python-neutron-plugin-midonet')
246
 
            plugins['midonet']['server_packages'].append(
247
 
                'python-networking-midonet')
 
240
        plugins['midonet']['driver'] = (
 
241
            'midonet.neutron.plugin_v1.MidonetPluginV2')
 
242
        plugins['midonet']['server_packages'].remove(
 
243
            'python-neutron-plugin-midonet')
 
244
        plugins['midonet']['server_packages'].append(
 
245
            'python-networking-midonet')
 
246
        plugins['plumgrid']['driver'] = (
 
247
            'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2')
 
248
        plugins['plumgrid']['server_packages'].remove(
 
249
            'neutron-plugin-plumgrid')
248
250
    return plugins
249
251
 
250
252