← Back to branch summary

~hopem/charms/trusty/neutron-openvswitch/ensure-tmpdir-cleanup

« back to all changes in this revision

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

  • Committer: Liam Young
  • Date: 2015-04-16 10:30:12 UTC
  • Revision ID: liam.young@canonical.com-20150416103012-it2xr0rv3jc3b82w
[gnuoy,trivial] Pre-release charmhelper sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/neutron.py
180
180
                          'nova-api-metadata']],
181
181
            'server_packages': ['neutron-server', 'calico-control'],
182
182
            'server_services': ['neutron-server']
 
183
        },
 
184
        'vsp': {
 
185
            'config': '/etc/neutron/plugins/nuage/nuage_plugin.ini',
 
186
            'driver': 'neutron.plugins.nuage.plugin.NuagePlugin',
 
187
            'contexts': [
 
188
                context.SharedDBContext(user=config('neutron-database-user'),
 
189
                                        database=config('neutron-database'),
 
190
                                        relation_prefix='neutron',
 
191
                                        ssl_dir=NEUTRON_CONF_DIR)],
 
192
            'services': [],
 
193
            'packages': [],
 
194
            'server_packages': ['neutron-server', 'neutron-plugin-nuage'],
 
195
            'server_services': ['neutron-server']
183
196
        }
184
197
    }
185
198
    if release >= 'icehouse':