~hopem/charms/trusty/nova-cloud-controller/lp1499643

« back to all changes in this revision

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

  • Committer: Liam Young
  • Date: 2015-09-03 09:39:34 UTC
  • Revision ID: liam.young@canonical.com-20150903093934-i180kiwkp3qqyi0u
[gnuoy,trivial] Charmhelper sync (+1'd by mojo)

Show diffs side-by-side

added added

removed removed

Lines of Context:
195
195
            'packages': [],
196
196
            'server_packages': ['neutron-server', 'neutron-plugin-nuage'],
197
197
            'server_services': ['neutron-server']
 
198
        },
 
199
        'plumgrid': {
 
200
            'config': '/etc/neutron/plugins/plumgrid/plumgrid.ini',
 
201
            'driver': 'neutron.plugins.plumgrid.plumgrid_plugin.plumgrid_plugin.NeutronPluginPLUMgridV2',
 
202
            'contexts': [
 
203
                context.SharedDBContext(user=config('database-user'),
 
204
                                        database=config('database'),
 
205
                                        ssl_dir=NEUTRON_CONF_DIR)],
 
206
            'services': [],
 
207
            'packages': [['plumgrid-lxc'],
 
208
                         ['iovisor-dkms']],
 
209
            'server_packages': ['neutron-server',
 
210
                                'neutron-plugin-plumgrid'],
 
211
            'server_services': ['neutron-server']
198
212
        }
199
213
    }
200
214
    if release >= 'icehouse':