← Back to branch summary

~peter-sabaini/charm-helpers/bcache-helpers

« back to all changes in this revision

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

  • Committer: David Ames
  • Date: 2017-03-27 16:46:43 UTC
  • mfrom: (719.1.5 charm-helpers)
  • Revision ID: david.ames@canonical.com-20170327164643-ngmy4f1qqiyrxip8
[ajkavanagh, r=thedac] Re-organize alphanumeric comparisons

Allow the use of alphanumeric comparisons *in* charmhelpers
Move BasicStringComparator to charmhelpers.core.strutils
Rename CompareUbuntuReleases to CompareHostReleases

Show diffs side-by-side

added added

removed removed

Lines of Context:
charmhelpers/contrib/openstack/neutron.py
23
23
    ERROR,
24
24
)
25
25
 
26
 
from charmhelpers.contrib.openstack.utils import os_release
 
26
from charmhelpers.contrib.openstack.utils import (
 
27
    os_release,
 
28
    CompareOpenStackReleases,
 
29
)
27
30
 
28
31
 
29
32
def headers_package():
198
201
        },
199
202
        'plumgrid': {
200
203
            'config': '/etc/neutron/plugins/plumgrid/plumgrid.ini',
201
 
            'driver': 'neutron.plugins.plumgrid.plumgrid_plugin.plumgrid_plugin.NeutronPluginPLUMgridV2',
 
204
            'driver': ('neutron.plugins.plumgrid.plumgrid_plugin'
 
205
                       '.plumgrid_plugin.NeutronPluginPLUMgridV2'),
202
206
            'contexts': [
203
207
                context.SharedDBContext(user=config('database-user'),
204
208
                                        database=config('database'),
225
229
            'server_services': ['neutron-server']
226
230
        }
227
231
    }
228
 
    if release >= 'icehouse':
 
232
    if CompareOpenStackReleases(release) >= 'icehouse':
229
233
        # NOTE: patch in ml2 plugin for icehouse onwards
230
234
        plugins['ovs']['config'] = '/etc/neutron/plugins/ml2/ml2_conf.ini'
231
235
        plugins['ovs']['driver'] = 'neutron.plugins.ml2.plugin.Ml2Plugin'
233
237
                                             'neutron-plugin-ml2']
234
238
        # NOTE: patch in vmware renames nvp->nsx for icehouse onwards
235
239
        plugins['nvp'] = plugins['nsx']
236
 
    if release >= 'kilo':
 
240
    if CompareOpenStackReleases(release) >= 'kilo':
237
241
        plugins['midonet']['driver'] = (
238
242
            'neutron.plugins.midonet.plugin.MidonetPluginV2')
239
 
    if release >= 'liberty':
 
243
    if CompareOpenStackReleases(release) >= 'liberty':
240
244
        plugins['midonet']['driver'] = (
241
245
            'midonet.neutron.plugin_v1.MidonetPluginV2')
242
246
        plugins['midonet']['server_packages'].remove(
244
248
        plugins['midonet']['server_packages'].append(
245
249
            'python-networking-midonet')
246
250
        plugins['plumgrid']['driver'] = (
247
 
            'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2')
 
251
            'networking_plumgrid.neutron.plugins'
 
252
            '.plugin.NeutronPluginPLUMgridV2')
248
253
        plugins['plumgrid']['server_packages'].remove(
249
254
            'neutron-plugin-plumgrid')
250
 
    if release >= 'mitaka':
 
255
    if CompareOpenStackReleases(release) >= 'mitaka':
251
256
        plugins['nsx']['server_packages'].remove('neutron-plugin-vmware')
252
257
        plugins['nsx']['server_packages'].append('python-vmware-nsx')
253
258
        plugins['nsx']['config'] = '/etc/neutron/nsx.ini'