← Back to branch summary

~corey.bryant/charms/trusty/neutron-openvswitch/git-1531612

« back to all changes in this revision

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

  • Committer: Corey Bryant
  • Date: 2016-01-04 21:29:08 UTC
  • Revision ID: corey.bryant@canonical.com-20160104212908-0pcanpyjy7pcycbq
[corey.bryant,r=trivial] Sync charm-helpers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/neutron.py
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']
 
212
        },
 
213
        'midonet': {
 
214
            'config': '/etc/neutron/plugins/midonet/midonet.ini',
 
215
            'driver': 'midonet.neutron.plugin.MidonetPluginV2',
 
216
            'contexts': [
 
217
                context.SharedDBContext(user=config('neutron-database-user'),
 
218
                                        database=config('neutron-database'),
 
219
                                        relation_prefix='neutron',
 
220
                                        ssl_dir=NEUTRON_CONF_DIR)],
 
221
            'services': [],
 
222
            'packages': [[headers_package()] + determine_dkms_package()],
 
223
            'server_packages': ['neutron-server',
 
224
                                'python-neutron-plugin-midonet'],
 
225
            'server_services': ['neutron-server']
212
226
        }
213
227
    }
214
228
    if release >= 'icehouse':