← Back to branch summary

~gnuoy/charms/trusty/ceilometer/amulet

« back to all changes in this revision

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

  • Committer: Liam Young
  • Date: 2014-07-29 08:13:37 UTC
  • mfrom: (49.1.11 ceilometer)
  • Revision ID: liam.young@canonical.com-20140729081337-lp8a9ajuj6b7ql4w
[jamespage,r=gnuoy] Add support for multiple network configuration

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/neutron.py
128
128
            'server_packages': ['neutron-server',
129
129
                                'neutron-plugin-vmware'],
130
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']
131
145
        }
132
146
    }
133
147
    if release >= 'icehouse':