openstack/charm-neutron-gateway
Code Issues Proposed changes

Switch to a more descriptive name for the overlay network type

Browse Source
This commit is contained in:
Liam Young 2014-10-02 11:05:47 +00:00
parent ead78fc3d8
commit 1407fe5b01
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/quantum_contexts.py
View File

@ -107,7 +107,7 @@ def _neutron_api_settings():
''' '''
neutron_settings = { neutron_settings = {
'l2_population': True, 'l2_population': True,
'ml2_typedriver': 'gre', 'overlay_network_type': 'gre',
} }
for rid in relation_ids('neutron-plugin-api'): for rid in relation_ids('neutron-plugin-api'):
@ -117,7 +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'], 'overlay_network_type': rdata['overlay-network-type'],
} }
return neutron_settings return neutron_settings
return neutron_settings return neutron_settings
@ -216,7 +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'], 'overlay_network_type': neutron_api_settings['overlay_network_type'],
} }
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 = {{ ml2_typedriver }} tunnel_types = {{ overlay_network_type }}
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