openstack/charm-neutron-gateway
Code Issues Proposed changes

Add support for using vxlan network type driver

Browse Source
This commit is contained in:
Liam Young 2014-09-30 15:39:09 +00:00
parent 01ab9d50ba
commit ead78fc3d8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/quantum_contexts.py
View File

@ -107,6 +107,7 @@ def _neutron_api_settings():
''' '''
neutron_settings = { neutron_settings = {
'l2_population': True, 'l2_population': True,
'ml2_typedriver': 'gre',
} }
for rid in relation_ids('neutron-plugin-api'): for rid in relation_ids('neutron-plugin-api'):
@ -116,6 +117,7 @@ def _neutron_api_settings():
continue continue
neutron_settings = { neutron_settings = {
'l2_population': rdata['l2-population'], 'l2_population': rdata['l2-population'],
'ml2_typedriver': rdata['neutron-ml2-typedriver'],
} }
return neutron_settings return neutron_settings
return neutron_settings return neutron_settings
@ -214,6 +216,7 @@ class QuantumGatewayContext(OSContextGenerator):
'verbose': config('verbose'), 'verbose': config('verbose'),
'instance_mtu': config('instance-mtu'), 'instance_mtu': config('instance-mtu'),
'l2_population': neutron_api_settings['l2_population'], 'l2_population': neutron_api_settings['l2_population'],
'ml2_typedriver': neutron_api_settings['ml2_typedriver'],
} }
return ctxt return ctxt

2
templates/icehouse/ml2_conf.ini
View File

@ -14,7 +14,7 @@ vni_ranges = 1001:2000
enable_tunneling = True enable_tunneling = True
local_ip = {{ local_ip }} local_ip = {{ local_ip }}
[agent] [agent]
tunnel_types = gre tunnel_types = {{ ml2_typedriver }}
l2_population = {{ l2_population }} l2_population = {{ l2_population }}
[securitygroup] [securitygroup]
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver