← Back to branch summary

~gnuoy/charms/trusty/cinder/stable-charm-sync

« back to all changes in this revision

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

  • Committer: james.page at ubuntu
  • Date: 2014-05-21 09:57:23 UTC
  • mfrom: (35.1.2 cinder)
  • Revision ID: james.page@ubuntu.com-20140521095723-qiulw0yz0q0k1jcd
[tribaal,r=james-page,t=james-page]

Resync helpers to pickup fixes for apt lock races and better block device detection and handling.

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']
117
131
        }
118
132
    }
119
 
    # NOTE: patch in ml2 plugin for icehouse onwards
120
133
    if release >= 'icehouse':
 
134
        # NOTE: patch in ml2 plugin for icehouse onwards
121
135
        plugins['ovs']['config'] = '/etc/neutron/plugins/ml2/ml2_conf.ini'
122
136
        plugins['ovs']['driver'] = 'neutron.plugins.ml2.plugin.Ml2Plugin'
123
137
        plugins['ovs']['server_packages'] = ['neutron-server',
124
138
                                             'neutron-plugin-ml2']
 
139
        # NOTE: patch in vmware renames nvp->nsx for icehouse onwards
 
140
        plugins['nvp'] = plugins['nsx']
125
141
    return plugins
126
142
 
127
143