← Back to branch summary

~openstack-charmers-next/charms/wily/odl-controller/trunk

« back to all changes in this revision

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

  • Committer: Gerrit Code Review
  • Author(s): Jenkins
  • Date: 2016-03-18 16:10:08 UTC
  • mfrom: (21.1.1 trunk)
  • Revision ID: review@openstack.org-20160318161008-grzlrlzei667shdd
Merge "Add support for Ubuntu Xenial"

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/neutron.py
50
50
    if kernel_version() >= (3, 13):
51
51
        return []
52
52
    else:
53
 
        return ['openvswitch-datapath-dkms']
 
53
        return [headers_package(), 'openvswitch-datapath-dkms']
54
54
 
55
55
 
56
56
# legacy
70
70
                                        relation_prefix='neutron',
71
71
                                        ssl_dir=QUANTUM_CONF_DIR)],
72
72
            'services': ['quantum-plugin-openvswitch-agent'],
73
 
            'packages': [[headers_package()] + determine_dkms_package(),
 
73
            'packages': [determine_dkms_package(),
74
74
                         ['quantum-plugin-openvswitch-agent']],
75
75
            'server_packages': ['quantum-server',
76
76
                                'quantum-plugin-openvswitch'],
111
111
                                        relation_prefix='neutron',
112
112
                                        ssl_dir=NEUTRON_CONF_DIR)],
113
113
            'services': ['neutron-plugin-openvswitch-agent'],
114
 
            'packages': [[headers_package()] + determine_dkms_package(),
 
114
            'packages': [determine_dkms_package(),
115
115
                         ['neutron-plugin-openvswitch-agent']],
116
116
            'server_packages': ['neutron-server',
117
117
                                'neutron-plugin-openvswitch'],
155
155
                                        relation_prefix='neutron',
156
156
                                        ssl_dir=NEUTRON_CONF_DIR)],
157
157
            'services': [],
158
 
            'packages': [[headers_package()] + determine_dkms_package(),
 
158
            'packages': [determine_dkms_package(),
159
159
                         ['neutron-plugin-cisco']],
160
160
            'server_packages': ['neutron-server',
161
161
                                'neutron-plugin-cisco'],
174
174
                         'neutron-dhcp-agent',
175
175
                         'nova-api-metadata',
176
176
                         'etcd'],
177
 
            'packages': [[headers_package()] + determine_dkms_package(),
 
177
            'packages': [determine_dkms_package(),
178
178
                         ['calico-compute',
179
179
                          'bird',
180
180
                          'neutron-dhcp-agent',
204
204
                                        database=config('database'),
205
205
                                        ssl_dir=NEUTRON_CONF_DIR)],
206
206
            'services': [],
207
 
            'packages': [['plumgrid-lxc'],
208
 
                         ['iovisor-dkms']],
 
207
            'packages': ['plumgrid-lxc',
 
208
                         'iovisor-dkms'],
209
209
            'server_packages': ['neutron-server',
210
210
                                'neutron-plugin-plumgrid'],
211
211
            'server_services': ['neutron-server']
219
219
                                        relation_prefix='neutron',
220
220
                                        ssl_dir=NEUTRON_CONF_DIR)],
221
221
            'services': [],
222
 
            'packages': [[headers_package()] + determine_dkms_package()],
 
222
            'packages': [determine_dkms_package()],
223
223
            'server_packages': ['neutron-server',
224
224
                                'python-neutron-plugin-midonet'],
225
225
            'server_services': ['neutron-server']
233
233
                                             'neutron-plugin-ml2']
234
234
        # NOTE: patch in vmware renames nvp->nsx for icehouse onwards
235
235
        plugins['nvp'] = plugins['nsx']
 
236
    if release >= 'kilo':
 
237
        plugins['midonet']['driver'] = (
 
238
            'neutron.plugins.midonet.plugin.MidonetPluginV2')
 
239
    if release >= 'liberty':
 
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')
236
250
    return plugins
237
251
 
238
252