← Back to branch summary

~openstack-ubuntu-testing/charms/precise/nova-cloud-controller/trunk

« back to all changes in this revision

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

  • Committer: James Page
  • Date: 2014-01-20 15:24:35 UTC
  • mfrom: (22.33.7 nova-cloud-controller)
  • Revision ID: james.page@canonical.com-20140120152435-5tymrwa1c1b10bir
Merge icehouse-next changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/neutron.py
57
57
 
58
58
def neutron_plugins():
59
59
    from charmhelpers.contrib.openstack import context
60
 
    return {
 
60
    release = os_release('nova-common')
 
61
    plugins = {
61
62
        'ovs': {
62
63
            'config': '/etc/neutron/plugins/openvswitch/'
63
64
                      'ovs_neutron_plugin.ini',
69
70
                                        relation_prefix='neutron')],
70
71
            'services': ['neutron-plugin-openvswitch-agent'],
71
72
            'packages': [[headers_package(), 'openvswitch-datapath-dkms'],
72
 
                         ['quantum-plugin-openvswitch-agent']],
 
73
                         ['neutron-plugin-openvswitch-agent']],
73
74
            'server_packages': ['neutron-server',
74
75
                                'neutron-plugin-openvswitch'],
75
76
            'server_services': ['neutron-server']
89
90
            'server_services': ['neutron-server']
90
91
        }
91
92
    }
 
93
    # NOTE: patch in ml2 plugin for icehouse onwards
 
94
    if release >= 'icehouse':
 
95
        plugins['ovs']['config'] = '/etc/neutron/plugins/ml2/ml2_conf.ini'
 
96
        plugins['ovs']['driver'] = 'neutron.plugins.ml2.plugin.Ml2Plugin'
 
97
        plugins['ovs']['server_packages'] = ['neutron-server',
 
98
                                             'neutron-plugin-ml2']
 
99
    return plugins
92
100
 
93
101
 
94
102
def neutron_plugin_attribute(plugin, attr, net_manager=None):