← Back to branch summary

~ionutbalutoiu/charms/trusty/neutron-api/next

« back to all changes in this revision

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

  • Committer: James Page
  • Date: 2014-06-24 11:05:17 UTC
  • Revision ID: james.page@ubuntu.com-20140624110517-7chb3mwca2mtnmlp
Resync helpers, add standard targets to Makefile

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/neutron.py
114
114
            'server_packages': ['neutron-server',
115
115
                                'neutron-plugin-nicira'],
116
116
            'server_services': ['neutron-server']
 
117
        },
 
118
        'nsx': {
 
119
            'config': '/etc/neutron/plugins/vmware/nsx.ini',
 
120
            'driver': 'vmware',
 
121
            'contexts': [
 
122
                context.SharedDBContext(user=config('neutron-database-user'),
 
123
                                        database=config('neutron-database'),
 
124
                                        relation_prefix='neutron',
 
125
                                        ssl_dir=NEUTRON_CONF_DIR)],
 
126
            'services': [],
 
127
            'packages': [],
 
128
            'server_packages': ['neutron-server',
 
129
                                'neutron-plugin-vmware'],
 
130
            'server_services': ['neutron-server']
 
131
        },
 
132
        'n1kv': {
 
133
            'config': '/etc/neutron/plugins/cisco/cisco_plugins.ini',
 
134
            'driver': 'neutron.plugins.cisco.network_plugin.PluginV2',
 
135
            'contexts': [
 
136
                context.SharedDBContext(user=config('neutron-database-user'),
 
137
                                        database=config('neutron-database'),
 
138
                                        relation_prefix='neutron',
 
139
                                        ssl_dir=NEUTRON_CONF_DIR)],
 
140
            'services': [],
 
141
            'packages': [['neutron-plugin-cisco']],
 
142
            'server_packages': ['neutron-server',
 
143
                                'neutron-plugin-cisco'],
 
144
            'server_services': ['neutron-server']
117
145
        }
118
146
    }
119
 
    # NOTE: patch in ml2 plugin for icehouse onwards
120
147
    if release >= 'icehouse':
 
148
        # NOTE: patch in ml2 plugin for icehouse onwards
121
149
        plugins['ovs']['config'] = '/etc/neutron/plugins/ml2/ml2_conf.ini'
122
150
        plugins['ovs']['driver'] = 'neutron.plugins.ml2.plugin.Ml2Plugin'
123
151
        plugins['ovs']['server_packages'] = ['neutron-server',
124
152
                                             'neutron-plugin-ml2']
 
153
        # NOTE: patch in vmware renames nvp->nsx for icehouse onwards
 
154
        plugins['nvp'] = plugins['nsx']
125
155
    return plugins
126
156
 
127
157
 
154
184
    upgrading from G).
155
185
    '''
156
186
    release = os_release('nova-common')
157
 
    manager = 'neutron'
 
187
    manager = config('network-manager').lower()
158
188
 
159
189
    if manager not in ['quantum', 'neutron']:
160
190
        return manager