← Back to branch summary

~openstack-charmers-archive/charms/trusty/neutron-gateway/next

« back to all changes in this revision

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

  • Committer: Edward Hope-Morley
  • Date: 2016-02-12 09:55:04 UTC
  • mfrom: (162.1.2 neutron-gateway.lp1518975)
  • Revision ID: edward.hope-morley@canonical.com-20160212095504-6oaokktylqcit5m6
[hopem,r=jamespage]

Sync charmhelpers to get support for supplying a Ascii Armor PGP key to
openstack-origin (currently only supports Radix64)
Closes-Bug: 1518975

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',
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
        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')
236
248
    return plugins
237
249
 
238
250